Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
joid: Remove multijobs
[releng.git]
/
jjb
/
joid
/
joid-ci-jobs.yml
diff --git
a/jjb/joid/joid-ci-jobs.yml
b/jjb/joid/joid-ci-jobs.yml
index
12a49f3
..
dfd6084
100644
(file)
--- a/
jjb/joid/joid-ci-jobs.yml
+++ b/
jjb/joid/joid-ci-jobs.yml
@@
-28,6
+28,8
@@
pod:
- intel-pod5:
<<: *brahmaputra
pod:
- intel-pod5:
<<: *brahmaputra
+ - virtual:
+ <<: *brahmaputra
#--------------------------------
# master
#--------------------------------
#--------------------------------
# master
#--------------------------------
@@
-37,6
+39,8
@@
<<: *master
- juniper-pod1:
<<: *master
<<: *master
- juniper-pod1:
<<: *master
+ - virtual:
+ <<: *master
#--------------------------------
# new scenario descriptions
scenario:
#--------------------------------
# new scenario descriptions
scenario:
@@
-58,7
+62,7
@@
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
jobs:
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
jobs:
- - 'joid-{scenario}-{pod}-daily-{stream}'
+
#
- 'joid-{scenario}-{pod}-daily-{stream}'
- 'joid-deploy-{pod}-daily-{stream}'
########################
- 'joid-deploy-{pod}-daily-{stream}'
########################
@@
-92,7
+96,8
@@
- project-parameter:
project: '{project}'
- '{installer}-defaults'
- project-parameter:
project: '{project}'
- '{installer}-defaults'
- - '{pod}-defaults'
+ - '{pod}-defaults':
+ installer: '{installer}'
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
@@
-146,7
+151,11
@@
- project-parameter:
project: '{project}'
- '{installer}-defaults'
- project-parameter:
project: '{project}'
- '{installer}-defaults'
- - '{pod}-defaults'
+ - '{pod}-defaults':
+ installer: '{installer}'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-odl_l2-nofeature-ha'
scm:
- git-scm:
scm:
- git-scm:
@@
-156,7
+165,6
@@
builders:
- 'builder-macro'
builders:
- 'builder-macro'
-
########################
# builder macros
########################
########################
# builder macros
########################
@@
-192,3
+200,7
@@
name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-trigger'
triggers:
- timed: ''
name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'joid-os-odl_l2-nofeature-ha-virtual-trigger'
+ triggers:
+ - timed: ''