Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Apex: Fix functest docker tag passing for gate
[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
854aefc
..
a61d9fd
100644
(file)
--- a/
jjb/apex/apex-verify-jobs.yaml
+++ b/
jjb/apex/apex-verify-jobs.yaml
@@
-173,6
+173,8
@@
pattern: 'config/**'
- compare-type: ANT
pattern: 'apex/build/**'
pattern: 'config/**'
- compare-type: ANT
pattern: 'apex/build/**'
+ - compare-type: ANT
+ pattern: 'apex/builders/**'
- compare-type: ANT
pattern: 'apex/common/**'
- compare-type: ANT
- compare-type: ANT
pattern: 'apex/common/**'
- compare-type: ANT
@@
-353,14
+355,11
@@
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
+ - shell:
+ !include-raw-escape: ./apex-functest-scenario.sh
- inject:
- inject:
- properties-file: functest_repo
+ properties-file: functest_tag
+ override-build-parameters: true
- multijob:
name: functest-smoke
condition: ALWAYS
- multijob:
name: functest-smoke
condition: ALWAYS
@@
-369,9
+368,9
@@
current-parameters: false
predefined-parameters: |
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
current-parameters: false
predefined-parameters: |
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ DOCKER_TAG=$DOCKER_TAG
FUNCTEST_SUITE_NAME=tempest_smoke
FUNCTEST_MODE=testcase
FUNCTEST_SUITE_NAME=tempest_smoke
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