summaryrefslogtreecommitdiffstats
path: root/build-gluster-org
diff options
context:
space:
mode:
authorNigel Babu <nigelb@redhat.com>2017-06-21 18:54:37 +0530
committerNigel Babu <nigelb@redhat.com>2017-06-21 18:54:37 +0530
commit999075a41bf9497f07a646cf3814af34c9b5dcdd (patch)
tree5440a7fbcaf9e3d7394ea3f9323266c627ca9ff0 /build-gluster-org
parentc7aea499d2874a4b5db776eb85a1fa50f02dbd12 (diff)
Revert the centos-regression changes
Change-Id: Ia0efd6b4948735e1b4a10ca872f3d8721f7cb01d
Diffstat (limited to 'build-gluster-org')
-rw-r--r--build-gluster-org/jobs/centos6-regression.yml1
-rw-r--r--build-gluster-org/scripts/centos-regression.sh6
2 files changed, 1 insertions, 6 deletions
diff --git a/build-gluster-org/jobs/centos6-regression.yml b/build-gluster-org/jobs/centos6-regression.yml
index 7e4555a..368518a 100644
--- a/build-gluster-org/jobs/centos6-regression.yml
+++ b/build-gluster-org/jobs/centos6-regression.yml
@@ -12,7 +12,6 @@
refspec: $GERRIT_REFSPEC
choosing-strategy: gerrit
url: git://review.gluster.org/glusterfs.git
- wipe-workspace: false
properties:
- discard-after-x:
diff --git a/build-gluster-org/scripts/centos-regression.sh b/build-gluster-org/scripts/centos-regression.sh
index d167b78..952463f 100644
--- a/build-gluster-org/scripts/centos-regression.sh
+++ b/build-gluster-org/scripts/centos-regression.sh
@@ -85,11 +85,7 @@ echo
echo "Run the regression test"
echo "***********************"
echo
-if [ "$GERRIT_BRANCH" = "master" ]; then
- sudo -E bash /opt/qa/regression.sh tests/basic
-else
- sudo -E bash /opt/qa/regression.sh
-fi
+sudo -E bash /opt/qa/regression.sh
RET=$?
if [ $RET = 0 ]; then