diff options
Diffstat (limited to 'jjb/xci')
| -rw-r--r-- | jjb/xci/xci-merge-jobs.yml | 2 | ||||
| -rwxr-xr-x | jjb/xci/xci-start-new-vm.sh | 15 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 2 |
3 files changed, 14 insertions, 5 deletions
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 dd953e927..174932813 100755 --- a/jjb/xci/xci-start-new-vm.sh +++ b/jjb/xci/xci-start-new-vm.sh @@ -68,14 +68,23 @@ 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 - git fetch https://gerrit.opnfv.org/gerrit/$GERRIT_PROJECT $GERRIT_REFSPEC && git checkout FETCH_HEAD - cd - + export XCI_ANSIBLE_PARAMS="-e @/home/devuser/releng-xci/scenario_overrides.yml" fi cd xci ./xci-deploy.sh | ts EOF + +if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then + cat > scenario_overrides.yml <<-EOF +--- +xci_scenarios_overrides: + - scenario: $DEPLOY_SCENARIO + version: $GERRIT_PATCHSET_REVISION + refspec: $GERRIT_REFSPEC +EOF +fi + chmod a+x xci_test.sh export XCI_BUILD_CLEAN_VM_OS=false 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}' |