diff options
Diffstat (limited to 'jjb/xci')
| -rw-r--r-- | jjb/xci/xci-merge-jobs.yml | 2 | ||||
| -rwxr-xr-x | jjb/xci/xci-promote.sh | 4 | ||||
| -rwxr-xr-x | jjb/xci/xci-run-functest.sh | 5 | ||||
| -rwxr-xr-x | jjb/xci/xci-start-new-vm.sh | 3 |
4 files changed, 13 insertions, 1 deletions
diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml index d6442a976..e4e5705a7 100644 --- a/jjb/xci/xci-merge-jobs.yml +++ b/jjb/xci/xci-merge-jobs.yml @@ -87,6 +87,8 @@ pattern: 'prototypes/**' - compare-type: ANT pattern: 'upstream/**' + - compare-type: ANT + pattern: 'INFO.yaml' - project-compare-type: 'REG_EXP' project-pattern: 'sfc|sdnvpn' branches: 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-run-functest.sh b/jjb/xci/xci-run-functest.sh index 2e343631b..aa98e07aa 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -49,7 +49,10 @@ if ! sed -n "/^- scenario: $DEPLOY_SCENARIO$/,/^$/p" $OPNFV_SCENARIO_REQUIREMENT exit 0 fi -ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "cd releng-xci/xci && PATH=/home/devuser/.local/bin:$PATH ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml" +# set XCI_VENV for ansible +export XCI_VENV=/home/devuser/releng-xci/venv + +ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; cd releng-xci/xci && ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml" echo "Running functest" ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/run-functest.sh" echo "Functest log" 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 |