From e9e33d3cf0f6e9b555d633611645f41619a3d4e5 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 13 Dec 2016 21:52:01 +0100 Subject: [PATCH] 3rd party ci: Wipe the workspace before doing anything else Due to not cloning the repos, the workspace is not wiped out. This change makes sure we remove everything in workspace to prevent jenkins from complaining. Change-Id: Ife3c4c752cf37c6ff3bfcdea6ffaebc72c440373 Signed-off-by: Fatih Degirmenci --- jjb/3rd_party_ci/create-apex-vms.sh | 6 +++++- jjb/3rd_party_ci/download-netvirt-artifact.sh | 4 ++++ jjb/3rd_party_ci/functest-netvirt.sh | 5 ++++- jjb/3rd_party_ci/postprocess-netvirt.sh | 5 ++++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/jjb/3rd_party_ci/create-apex-vms.sh b/jjb/3rd_party_ci/create-apex-vms.sh index f35067142..11a35acf5 100755 --- a/jjb/3rd_party_ci/create-apex-vms.sh +++ b/jjb/3rd_party_ci/create-apex-vms.sh @@ -1,8 +1,12 @@ #!/bin/bash set -e + +# 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 -popd \ No newline at end of file +popd diff --git a/jjb/3rd_party_ci/download-netvirt-artifact.sh b/jjb/3rd_party_ci/download-netvirt-artifact.sh index 671a5fe7f..20d6cc5f0 100755 --- a/jjb/3rd_party_ci/download-netvirt-artifact.sh +++ b/jjb/3rd_party_ci/download-netvirt-artifact.sh @@ -1,4 +1,8 @@ #!/bin/bash +set -e + +# wipe the WORKSPACE +/bin/rm -rf $WORKSPACE echo "Attempting to fetch the artifact location from ODL Jenkins" CHANGE_DETAILS_URL="https://git.opendaylight.org/gerrit/changes/netvirt~master~$GERRIT_CHANGE_ID/detail" diff --git a/jjb/3rd_party_ci/functest-netvirt.sh b/jjb/3rd_party_ci/functest-netvirt.sh index abc7975ce..d89423f57 100755 --- a/jjb/3rd_party_ci/functest-netvirt.sh +++ b/jjb/3rd_party_ci/functest-netvirt.sh @@ -1,4 +1,7 @@ #!/bin/bash +set -e + +# wipe the WORKSPACE +/bin/rm -rf $WORKSPACE echo "Hello World" -ls -al $WORKSPACE diff --git a/jjb/3rd_party_ci/postprocess-netvirt.sh b/jjb/3rd_party_ci/postprocess-netvirt.sh index abc7975ce..d89423f57 100755 --- a/jjb/3rd_party_ci/postprocess-netvirt.sh +++ b/jjb/3rd_party_ci/postprocess-netvirt.sh @@ -1,4 +1,7 @@ #!/bin/bash +set -e + +# wipe the WORKSPACE +/bin/rm -rf $WORKSPACE echo "Hello World" -ls -al $WORKSPACE -- 2.16.6