Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix Git URL Parameter for Release Merge Job
[releng.git]
/
jjb
/
apex
/
apex-verify-jobs.yaml
diff --git
a/jjb/apex/apex-verify-jobs.yaml
b/jjb/apex/apex-verify-jobs.yaml
index
2f29765
..
81e59bd
100644
(file)
--- a/
jjb/apex/apex-verify-jobs.yaml
+++ b/
jjb/apex/apex-verify-jobs.yaml
@@
-312,6
+312,7
@@
- 'apex-verify.*'
- 'apex-virtual.*'
- 'apex-.*-promote.*'
- 'apex-verify.*'
- 'apex-virtual.*'
- 'apex-.*-promote.*'
+ - 'odl-netvirt.*'
- throttle:
max-per-node: 1
max-total: 10
- throttle:
max-per-node: 1
max-total: 10
@@
-343,6
+344,14
@@
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
+ - shell: |
+ if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
+ echo 'REPO=opnfv' > functest_repo
+ else
+ echo 'REPO=ollivier' > functest_repo
+ fi
+ - inject:
+ properties-file: functest_repo
- multijob:
name: functest-smoke
condition: ALWAYS
- multijob:
name: functest-smoke
condition: ALWAYS
@@
-353,6
+362,7
@@
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
FUNCTEST_SUITE_NAME=tempest_smoke_serial
FUNCTEST_MODE=testcase
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
FUNCTEST_SUITE_NAME=tempest_smoke_serial
FUNCTEST_MODE=testcase
+ REPO=$REPO
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER