From 3a4bd17dd35ef792903601a109fe7934728bcd3c Mon Sep 17 00:00:00 2001 From: Nikolas Hermanns Date: Wed, 14 Dec 2016 15:18:16 +0100 Subject: [PATCH] Avoid removing the whole file system If scripts are used by hand and WORKSPACE is not set then rm -rf /* will remove the filesystem. Change-Id: I9bb9ee6643d3916fedc7d3848ecf9b03bde10fae Signed-off-by: Nikolas Hermanns --- jjb/3rd_party_ci/create-apex-vms.sh | 6 +++++- jjb/3rd_party_ci/download-netvirt-artifact.sh | 4 ++++ jjb/3rd_party_ci/install-netvirt.sh | 7 +++++++ jjb/3rd_party_ci/postprocess-netvirt.sh | 9 +++++---- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/jjb/3rd_party_ci/create-apex-vms.sh b/jjb/3rd_party_ci/create-apex-vms.sh index a076dd084..3f5dbd1c4 100755 --- a/jjb/3rd_party_ci/create-apex-vms.sh +++ b/jjb/3rd_party_ci/create-apex-vms.sh @@ -1,11 +1,15 @@ #!/bin/bash set -e +if [ -z ${WORKSPACE} ]; then + echo "WORKSPACE is unset. Please do so." + exit 1 +fi # wipe the WORKSPACE /bin/rm -rf $WORKSPACE/* - # clone opnfv sdnvpn repo git clone https://gerrit.opnfv.org/gerrit/p/sdnvpn.git $WORKSPACE/sdnvpn + . $WORKSPACE/sdnvpn/odl-pipeline/odl-pipeline-common.sh pushd $LIB ./test_environment.sh --env-number $APEX_ENV_NUMBER --cloner-info $CLONER_INFO --snapshot-disks $SNAPSHOT_DISKS --vjump-hosts $VIRTUAL_JUMPHOSTS diff --git a/jjb/3rd_party_ci/download-netvirt-artifact.sh b/jjb/3rd_party_ci/download-netvirt-artifact.sh index 0a48e3aec..be2d4059a 100755 --- a/jjb/3rd_party_ci/download-netvirt-artifact.sh +++ b/jjb/3rd_party_ci/download-netvirt-artifact.sh @@ -1,6 +1,10 @@ #!/bin/bash set -e +if [ -z ${WORKSPACE} ]; then + echo "WORKSPACE is unset. Please do so." + exit 1 +fi # wipe the WORKSPACE /bin/rm -rf $WORKSPACE/* diff --git a/jjb/3rd_party_ci/install-netvirt.sh b/jjb/3rd_party_ci/install-netvirt.sh index 96c4b9634..f111d4847 100755 --- a/jjb/3rd_party_ci/install-netvirt.sh +++ b/jjb/3rd_party_ci/install-netvirt.sh @@ -1,5 +1,12 @@ #!/bin/bash set -e + +if [ -z ${WORKSPACE} ]; then + echo "WORKSPACE is unset. Please do so." + exit 1 +fi +# wipe the WORKSPACE +/bin/rm -rf $WORKSPACE/* # clone opnfv sdnvpn repo git clone https://gerrit.opnfv.org/gerrit/p/sdnvpn.git $WORKSPACE/sdnvpn . $WORKSPACE/sdnvpn/odl-pipeline/odl-pipeline-common.sh diff --git a/jjb/3rd_party_ci/postprocess-netvirt.sh b/jjb/3rd_party_ci/postprocess-netvirt.sh index 2e99477c5..5baf378a9 100755 --- a/jjb/3rd_party_ci/postprocess-netvirt.sh +++ b/jjb/3rd_party_ci/postprocess-netvirt.sh @@ -1,14 +1,15 @@ #!/bin/bash set -e +if [ -z ${WORKSPACE} ]; then + echo "WORKSPACE is unset. Please do so." + exit 1 +fi # wipe the WORKSPACE -if [ -z ${WORKSPACE} ]; then echo "WORKSPACE is unset"; else echo "WORKSPACE is set to \"$WORKSPACE\""; fi -WORKSPACE=${WORKSPACE:-$PWD} /bin/rm -rf $WORKSPACE/* -set -e # clone opnfv sdnvpn repo git clone https://gerrit.opnfv.org/gerrit/p/sdnvpn.git $WORKSPACE/sdnvpn . $WORKSPACE/sdnvpn/odl-pipeline/odl-pipeline-common.sh pushd $LIB ./post_process.sh -popd \ No newline at end of file +popd -- 2.16.6