diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2017-06-07 08:41:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-07 08:41:17 +0000 |
| commit | 7a1a66c416c3e0331ceb39833c078f2279e2ce7f (patch) | |
| tree | 7d61408e9180e61610139a4afe727cbe63b97f8f /jjb | |
| parent | 62ce510224a1713fe6dfd75d3f4b0e3b5146ba26 (diff) | |
| parent | 73c548c48ec2d79045f03dedd92b143d603139f2 (diff) | |
Merge "fix the judgement condition"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/compass4nfv/compass-build.sh | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-download-artifact.sh | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-upload-artifact.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/jjb/compass4nfv/compass-build.sh b/jjb/compass4nfv/compass-build.sh index ea98c05a9..673a9f106 100644 --- a/jjb/compass4nfv/compass-build.sh +++ b/jjb/compass4nfv/compass-build.sh @@ -25,7 +25,7 @@ fi cd $WORKSPACE/ -if [[ "$BRANCH" == 'danube' ]]; then +if [[ "$BRANCH" == 'stable/danube' ]]; then ./build.sh --iso-dir $BUILD_DIRECTORY/ --iso-name compass.iso -c $CACHE_DIRECTORY OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $BUILD_DIRECTORY/compass.iso | cut -d' ' -f1) OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 111ac665c..2668ccdf8 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -23,7 +23,7 @@ fi echo 1 > /proc/sys/vm/drop_caches export CONFDIR=$WORKSPACE/deploy/conf -if [[ "$BRANCH" = 'danube' ]]; then +if [[ "$BRANCH" = 'stable/danube' ]]; then export ISO_URL=file://$BUILD_DIRECTORY/compass.iso else export ISO_URL=file://$BUILD_DIRECTORY/compass.tar.gz diff --git a/jjb/compass4nfv/compass-download-artifact.sh b/jjb/compass4nfv/compass-download-artifact.sh index c09a70c8b..f8915643f 100644 --- a/jjb/compass4nfv/compass-download-artifact.sh +++ b/jjb/compass4nfv/compass-download-artifact.sh @@ -18,7 +18,7 @@ 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 -if [[ "$BRANCH" == 'danube' ]]; then +if [[ "$BRANCH" == 'stable/danube' ]]; then # download the file curl -s -o $BUILD_DIRECTORY/compass.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1 # list the file diff --git a/jjb/compass4nfv/compass-upload-artifact.sh b/jjb/compass4nfv/compass-upload-artifact.sh index c6e179d4e..87a9334b2 100644 --- a/jjb/compass4nfv/compass-upload-artifact.sh +++ b/jjb/compass4nfv/compass-upload-artifact.sh @@ -7,7 +7,7 @@ echo "Uploading the $INSTALLER_TYPE artifact. This could take some time..." echo "--------------------------------------------------------" echo -if [[ "$BRANCH" == 'danube' ]]; then +if [[ "$BRANCH" == 'stable/danube' ]]; then FILETYPE='iso' else FILETYPE='tar.gz' |