diff options
Diffstat (limited to 'build-gluster-org/scripts')
-rw-r--r-- | build-gluster-org/scripts/gd2-smoke.sh | 26 | ||||
-rw-r--r-- | build-gluster-org/scripts/smoke.sh | 2 |
2 files changed, 1 insertions, 27 deletions
diff --git a/build-gluster-org/scripts/gd2-smoke.sh b/build-gluster-org/scripts/gd2-smoke.sh deleted file mode 100644 index b69c1bb..0000000 --- a/build-gluster-org/scripts/gd2-smoke.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -set -e - -function cleanup() { - killall glusterfs etcd make glusterd2 - sleep 5 - killall -9 glusterfs etcd make glusterd2 -} - -trap cleanup ERR - -JDIRS="/var/log/glusterfs /var/lib/glusterd /var/run/gluster /build" -sudo rm -rf $JDIRS -sudo mkdir -p $JDIRS || true -echo Return code = $? -sudo chown -RH jenkins:jenkins $JDIRS -echo Return code = $? -sudo chmod -R 755 $JDIRS -echo Return code = $? - -# build the glusterfs source code -/opt/qa/build.sh - -# run gd2 tests script -/opt/qa/glusterd2-test.sh diff --git a/build-gluster-org/scripts/smoke.sh b/build-gluster-org/scripts/smoke.sh index 49c8c73..27021d5 100644 --- a/build-gluster-org/scripts/smoke.sh +++ b/build-gluster-org/scripts/smoke.sh @@ -1,6 +1,6 @@ #!/bin/bash -BURL=${BUILD_URL}consoleFull +BURL="$BUILD_URL"consoleFull JDIRS="/var/log/glusterfs /var/lib/glusterd /var/lib/glusterd/groups/virt /var/run/gluster /d /d/archived_builds /d/backends /d/build /d/logs /home/jenkins/root /build/*" sudo mkdir -p $JDIRS |