From a92e50f2620670cd8d90421c31bd913bf3e941a4 Mon Sep 17 00:00:00 2001 From: wutianwei Date: Tue, 23 May 2017 10:47:58 +0800 Subject: set the openstack version for branch set the openstack version newton for danube set the openstack version ocata for master danube branch use the compass.iso master branch use the compass.tar.gz separate the branch in the different pod Change-Id: Iec1e3206cac26bb2ad5379fa2600ede0451d997d Signed-off-by: wutianwei --- jjb/compass4nfv/compass-download-artifact.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'jjb/compass4nfv/compass-download-artifact.sh') diff --git a/jjb/compass4nfv/compass-download-artifact.sh b/jjb/compass4nfv/compass-download-artifact.sh index 5a63c4aeb..c09a70c8b 100644 --- a/jjb/compass4nfv/compass-download-artifact.sh +++ b/jjb/compass4nfv/compass-download-artifact.sh @@ -18,12 +18,18 @@ curl -s -o $BUILD_DIRECTORY/latest.properties http://$GS_URL/latest.properties # source the file so we get OPNFV vars source $BUILD_DIRECTORY/latest.properties -# download the file -curl -s -o $BUILD_DIRECTORY/compass.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1 - -# list the file -ls -al $BUILD_DIRECTORY/compass.iso +if [[ "$BRANCH" == 'danube' ]]; then + # download the file + curl -s -o $BUILD_DIRECTORY/compass.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1 + # list the file + ls -al $BUILD_DIRECTORY/compass.iso +else + # download the file + curl -s -o $BUILD_DIRECTORY/compass.tar.gz http://$OPNFV_ARTIFACT_URL > gsutil.tar.gz.log 2>&1 + # list the file + ls -al $BUILD_DIRECTORY/compass.tar.gz +fi echo echo "--------------------------------------------------------" -echo "Done!" \ No newline at end of file +echo "Done!" -- cgit 1.2.3-korg