Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Move DEPLOY_SCENARIO out of testapi-parameters"
[releng.git]
/
jjb
/
apex
/
apex.yml.j2
diff --git
a/jjb/apex/apex.yml.j2
b/jjb/apex/apex.yml.j2
index
b0fc0d4
..
dac7c3a
100644
(file)
--- a/
jjb/apex/apex.yml.j2
+++ b/
jjb/apex/apex.yml.j2
@@
-3,6
+3,7
@@
name: 'apex'
project: 'apex'
jobs:
name: 'apex'
project: 'apex'
jobs:
+ - 'apex-fetch-logs-{stream}'
- 'apex-runner-cperf-{stream}'
- 'apex-virtual-{stream}'
- 'apex-deploy-{platform}-{stream}'
- 'apex-runner-cperf-{stream}'
- 'apex-virtual-{stream}'
- 'apex-deploy-{platform}-{stream}'
@@
-36,7
+37,7
@@
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
scenario_stream: 'fraser'
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
scenario_stream: 'fraser'
- disable_daily:
tru
e
+ disable_daily:
fals
e
disable_promote: true
- euphrates: &euphrates
branch: 'stable/euphrates'
disable_promote: true
- euphrates: &euphrates
branch: 'stable/euphrates'
@@
-88,7
+89,6
@@
scm:
- git-scm-gerrit
parameters:
scm:
- git-scm-gerrit
parameters:
- - '{project}-{platform}-{stream}-defaults'
- project-parameter:
project: '{project}'
branch: '{branch}'
- project-parameter:
project: '{project}'
branch: '{branch}'
@@
-298,7
+298,7
@@
git-revision: true
- multijob:
name: functest-smoke
git-revision: true
- multijob:
name: functest-smoke
- condition:
SUCCESSFUL
+ condition:
ALWAYS
projects:
- name: 'functest-apex-virtual-suite-{stream}'
current-parameters: false
projects:
- name: 'functest-apex-virtual-suite-{stream}'
current-parameters: false
@@
-315,7
+315,6
@@
git-revision: false
- multijob:
name: apex-fetch-logs
git-revision: false
- multijob:
name: apex-fetch-logs
- condition: ALWAYS
projects:
- name: 'apex-fetch-logs-{stream}'
current-parameters: false
projects:
- name: 'apex-fetch-logs-{stream}'
current-parameters: false
@@
-389,6
+388,7
@@
git-revision: false
- multijob:
name: 'OPNFV Test Suite'
git-revision: false
- multijob:
name: 'OPNFV Test Suite'
+ condition: ALWAYS
projects:
- name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
node-parameters: true
projects:
- name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
node-parameters: true
@@
-400,9
+400,8
@@
git-revision: false
- multijob:
name: apex-fetch-logs
git-revision: false
- multijob:
name: apex-fetch-logs
- condition: ALWAYS
projects:
projects:
- - name: 'apex-fetch-logs'
+ - name: 'apex-fetch-logs
-{scenario_stream}
'
current-parameters: true
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
current-parameters: true
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH