diff options
Diffstat (limited to 'jjb/xci')
| -rwxr-xr-x | jjb/xci/bifrost-verify.sh | 2 | ||||
| -rwxr-xr-x | jjb/xci/xci-promote.sh | 4 | ||||
| -rwxr-xr-x | jjb/xci/xci-start-new-vm.sh | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh index 9219d0020..9d524bcb0 100755 --- a/jjb/xci/bifrost-verify.sh +++ b/jjb/xci/bifrost-verify.sh @@ -17,7 +17,7 @@ cd $WORKSPACE git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD # combine opnfv and upstream scripts/playbooks -/bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE/ +/bin/cp -rf $WORKSPACE/releng-xci/xci/infra/bifrost/* $WORKSPACE/ cd $WORKSPACE/releng-xci cat > bifrost_test.sh<<EOF diff --git a/jjb/xci/xci-promote.sh b/jjb/xci/xci-promote.sh index fb7e0e6fa..4e72dc8ab 100755 --- a/jjb/xci/xci-promote.sh +++ b/jjb/xci/xci-promote.sh @@ -30,6 +30,10 @@ if [ ! -f $LOCAL_PROMOTION_METADATA_FILE ]; then exit 1 fi +# put additional info into the metadata file so we can use that for displaying the information +echo "PROMOTED_BY=$BUILD_URL" >> $LOCAL_PROMOTION_METADATA_FILE +echo "PROMOTED_ON=$(date -u '+%F_%H:%M'UTC)" >> $LOCAL_PROMOTION_METADATA_FILE + # upload promotion metadata file to OPNFV artifact repo echo "Storing promotion metadata as $REMOTE_PROMOTION_METADATA_FILE" gsutil cp $LOCAL_PROMOTION_METADATA_FILE $REMOTE_PROMOTION_METADATA_FILE > /dev/null 2>&1 diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh index 7874e6776..dd953e927 100755 --- a/jjb/xci/xci-start-new-vm.sh +++ b/jjb/xci/xci-start-new-vm.sh @@ -63,6 +63,9 @@ export OPNFV_RELENG_DEV_PATH=/home/devuser/releng-xci/ export INSTALLER_TYPE=$INSTALLER_TYPE export GIT_BASE=$GIT_BASE export JENKINS_HOME=$JENKINS_HOME +export CI_LOOP=$CI_LOOP +export BUILD_TAG=$BUILD_TAG +export NODE_NAME=$NODE_NAME if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then git clone https://gerrit.opnfv.org/gerrit/$GERRIT_PROJECT xci/scenarios/$DEPLOY_SCENARIO && cd xci/scenarios/$DEPLOY_SCENARIO |