Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add functest multijobs back to apex.
[releng.git]
/
jjb
/
apex
/
apex.yml.j2
diff --git
a/jjb/apex/apex.yml.j2
b/jjb/apex/apex.yml.j2
index
f49c7fa
..
ab65c4e
100644
(file)
--- a/
jjb/apex/apex.yml.j2
+++ b/
jjb/apex/apex.yml.j2
@@
-35,7
+35,7
@@
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
scenario_stream: 'euphrates'
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
scenario_stream: 'euphrates'
- disable_daily:
fals
e
+ disable_daily:
tru
e
- danube: &danube
branch: 'stable/danube'
gs-pathname: '/danube'
- danube: &danube
branch: 'stable/danube'
gs-pathname: '/danube'
@@
-129,8
+129,6
@@
- job-template:
name: 'apex-deploy-{platform}-{stream}'
- job-template:
name: 'apex-deploy-{platform}-{stream}'
- node: 'apex-{platform}-{stream}'
-
concurrent: true
disabled: false
concurrent: true
disabled: false
@@
-189,10
+187,10
@@
- job-template:
name: 'apex-virtual-{stream}'
- job-template:
name: 'apex-virtual-{stream}'
- node: 'apex-virtual-master'
-
project-type: 'multijob'
project-type: 'multijob'
+ concurrent: true
+
disabled: false
scm:
disabled: false
scm:
@@
-455,8
+453,6
@@
# branch: branch (eg. stable)
project-type: 'multijob'
# branch: branch (eg. stable)
project-type: 'multijob'
- node: '{baremetal-slave}'
-
disabled: '{obj:disable_daily}'
scm:
disabled: '{obj:disable_daily}'
scm: