diff options
author | Nigel Babu <nigelb@redhat.com> | 2018-02-15 11:52:53 +0530 |
---|---|---|
committer | Nigel Babu <nigelb@redhat.com> | 2018-02-20 05:51:17 +0000 |
commit | 9169fc518cf02b24e1915b507f63762dbea32072 (patch) | |
tree | 0d2595e025a8a60876f537a512629463ca3c4695 /build-gluster-org | |
parent | 48d5c58b06756a38f4d39e2a5170c017aa6e7507 (diff) |
Fix lcov and change regression node label
The line coverage tests ran smoke before regression Smoke, after it's
run cleans up the /var/lib/glusterd directory. This directory is
required for a bunch of different tests. So if we try to run regressions
without it, we create unexpected results.
It's time to move all of regressions to exclusively run on Centos 7. All
Centos 6 machines are officially now deprecated. We'll use a new tag and
add more Centos 6 machines as the week goes.
Change-Id: Idd38dd83c8c484163d8c62879868d318517eedab
Diffstat (limited to 'build-gluster-org')
-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 |