diff options
| -rw-r--r-- | build-gluster-org/jobs/centos-regression-fb.yml | 2 | ||||
| -rw-r--r-- | build-gluster-org/jobs/centos7-regression.yml (renamed from build-gluster-org/jobs/centos6-regression.yml) | 4 | ||||
| -rw-r--r-- | build-gluster-org/jobs/experimental-periodic.yml | 2 | ||||
| -rw-r--r-- | build-gluster-org/jobs/lcov.yml | 2 | ||||
| -rw-r--r-- | build-gluster-org/jobs/regression-test-burn-in.yml | 2 | ||||
| -rw-r--r-- | build-gluster-org/jobs/regression-test-ec-stripe-cache.yml | 2 | ||||
| -rw-r--r-- | build-gluster-org/jobs/regression-test-with-multiplex.yml | 2 | ||||
| -rw-r--r-- | build-gluster-org/scripts/lcov.sh | 14 |
8 files changed, 19 insertions, 11 deletions
diff --git a/build-gluster-org/jobs/centos-regression-fb.yml b/build-gluster-org/jobs/centos-regression-fb.yml index 64631bb..4f74972 100644 --- a/build-gluster-org/jobs/centos-regression-fb.yml +++ b/build-gluster-org/jobs/centos-regression-fb.yml @@ -1,6 +1,6 @@ - job: name: centos-regression-fb - node: rackspace_regression_2gb + node: centos7 description: Regression test every 4h on fb branch project-type: freestyle concurrent: true diff --git a/build-gluster-org/jobs/centos6-regression.yml b/build-gluster-org/jobs/centos7-regression.yml index f7ca8ad..1dca56e 100644 --- a/build-gluster-org/jobs/centos6-regression.yml +++ b/build-gluster-org/jobs/centos7-regression.yml @@ -1,6 +1,6 @@ - job: - name: centos6-regression - node: rackspace_regression_2gb + name: centos7-regression + node: centos7 description: Our production regression test. Triggerered for each Gerrit CR revision. project-type: freestyle concurrent: true diff --git a/build-gluster-org/jobs/experimental-periodic.yml b/build-gluster-org/jobs/experimental-periodic.yml index 52a7e39..6d440ac 100644 --- a/build-gluster-org/jobs/experimental-periodic.yml +++ b/build-gluster-org/jobs/experimental-periodic.yml @@ -1,6 +1,6 @@ - job: name: experimental-periodic - node: rackspace_regression_2gb + node: centos7 description: Regression test run nightly project-type: freestyle concurrent: true diff --git a/build-gluster-org/jobs/lcov.yml b/build-gluster-org/jobs/lcov.yml index 3e9751e..52258ab 100644 --- a/build-gluster-org/jobs/lcov.yml +++ b/build-gluster-org/jobs/lcov.yml @@ -1,6 +1,6 @@ - job: name: line-coverage - node: lcov + node: centos7 description: Checks line coverage by the regression test in gluster project-type: freestyle concurrent: true diff --git a/build-gluster-org/jobs/regression-test-burn-in.yml b/build-gluster-org/jobs/regression-test-burn-in.yml index 7a93e36..1aacf79 100644 --- a/build-gluster-org/jobs/regression-test-burn-in.yml +++ b/build-gluster-org/jobs/regression-test-burn-in.yml @@ -1,6 +1,6 @@ - job: name: regression-test-burn-in - node: rackspace_regression_2gb + node: centos7 description: Regression test run nightly project-type: freestyle concurrent: true diff --git a/build-gluster-org/jobs/regression-test-ec-stripe-cache.yml b/build-gluster-org/jobs/regression-test-ec-stripe-cache.yml index 7810554..82ef956 100644 --- a/build-gluster-org/jobs/regression-test-ec-stripe-cache.yml +++ b/build-gluster-org/jobs/regression-test-ec-stripe-cache.yml @@ -1,6 +1,6 @@ - job: name: regression-test-ec-stripe-cache - node: rackspace_regression_2gb + node: centos7 description: Regression test run every 8h with EC stripe cache enabled project-type: freestyle concurrent: true diff --git a/build-gluster-org/jobs/regression-test-with-multiplex.yml b/build-gluster-org/jobs/regression-test-with-multiplex.yml index fef67ef..9ea441d 100644 --- a/build-gluster-org/jobs/regression-test-with-multiplex.yml +++ b/build-gluster-org/jobs/regression-test-with-multiplex.yml @@ -1,6 +1,6 @@ - job: name: regression-test-with-multiplex - node: rackspace_regression_2gb + node: centos7 description: Regression test run every 8h with brick multiplex project-type: freestyle concurrent: true diff --git a/build-gluster-org/scripts/lcov.sh b/build-gluster-org/scripts/lcov.sh index a2b5a9e..6de3dc1 100644 --- a/build-gluster-org/scripts/lcov.sh +++ b/build-gluster-org/scripts/lcov.sh @@ -36,11 +36,13 @@ lcov -d . --zerocounters lcov -i -c -d . -o coverage/glusterfs-lcov.info set +e -echo "Running the smoke tests" -sudo -E bash /opt/qa/smoke.sh -c - echo "Running the regression test" sudo -E bash /opt/qa/regression.sh -c +REGRESSION_STATUS=$? + +echo "Running the smoke tests" +sudo -E bash /opt/qa/smoke.sh -c +SMOKE_STATUS=$? echo "Capturing the line coverage in the .info file" lcov -c -d . -o coverage/glusterfs-lcov.info @@ -49,3 +51,9 @@ sed -i.bak '/stdout/d' coverage/glusterfs-lcov.info #Generating the html page for code coverage details using genhtml genhtml -o coverage/ coverage/glusterfs-lcov.info echo "The HTML report is generated as index.html file" + +if [ $REGRESSION_STATUS -ne 0 ] || [ $SMOKE_STATUS -ne 0 ]; + then + echo "Smoke test or regression tests failed" + exit 1 +fi |