diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 1 | ||||
| -rw-r--r-- | jjb/xci/xci-merge-jobs.yml | 2 | ||||
| -rwxr-xr-x | jjb/xci/xci-start-new-vm.sh | 4 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index a02561dca..9616fb310 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -81,6 +81,7 @@ if [[ -f $OPENRC ]]; then exit 1 fi fi + echo "export EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" >> ${OPENRC} else echo "ERROR: cannot find file $OPENRC. Please check if it is existing." sudo ls -al ${DOVETAIL_CONFIG} diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml index e4e5705a7..2d112c7e5 100644 --- a/jjb/xci/xci-merge-jobs.yml +++ b/jjb/xci/xci-merge-jobs.yml @@ -90,7 +90,7 @@ - compare-type: ANT pattern: 'INFO.yaml' - project-compare-type: 'REG_EXP' - project-pattern: 'sfc|sdnvpn' + project-pattern: 'sfc|sdnvpn|releng-xci-scenarios' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh index f1585b9f0..174932813 100755 --- a/jjb/xci/xci-start-new-vm.sh +++ b/jjb/xci/xci-start-new-vm.sh @@ -68,7 +68,7 @@ export BUILD_TAG=$BUILD_TAG export NODE_NAME=$NODE_NAME if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then - XCI_ANSIBLE_PARAMS="-e /home/devuser/releng-xci/scenario_overrides.yml" + export XCI_ANSIBLE_PARAMS="-e @/home/devuser/releng-xci/scenario_overrides.yml" fi cd xci @@ -80,7 +80,7 @@ if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then --- xci_scenarios_overrides: - scenario: $DEPLOY_SCENARIO - version: $GERRIT_CHANGE_ID + version: $GERRIT_PATCHSET_REVISION refspec: $GERRIT_REFSPEC EOF fi diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index e5c1a9394..3b7df62f4 100644 --- a/jjb/xci/xci-verify-jobs.yml +++ b/jjb/xci/xci-verify-jobs.yml @@ -117,7 +117,7 @@ - compare-type: ANT pattern: 'upstream/**' - project-compare-type: 'REG_EXP' - project-pattern: 'sfc|sdnvpn' + project-pattern: 'sfc|sdnvpn|releng-xci-scenarios' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' |