diff options
Diffstat (limited to 'jjb/joid/joid-ci-jobs.yml')
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 188 |
1 files changed, 79 insertions, 109 deletions
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index ae03eab4a..6d0370983 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -15,10 +15,12 @@ master: &master stream: master branch: '{stream}' + disabled: false gs-pathname: '' - brahmaputra: &brahmaputra - stream: brahmaputra + colorado: &colorado + stream: colorado branch: 'stable/{stream}' + disabled: false gs-pathname: '/{stream}' #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING @@ -34,31 +36,26 @@ <<: *master - baremetal: slave-label: joid-baremetal - <<: *brahmaputra + <<: *colorado - virtual: slave-label: joid-virtual - <<: *brahmaputra + <<: *colorado #-------------------------------- # None-CI PODs #-------------------------------- - - orange-pod2: - slave-label: orange-pod2 - <<: *brahmaputra - - orange-pod2: - slave-label: orange-pod2 - <<: *master - - juniper-pod1: - slave-label: juniper-pod1 + - orange-pod1: + slave-label: orange-pod1 <<: *master #-------------------------------- -# new scenario descriptions +# scenarios +#-------------------------------- scenario: - 'os-nosdn-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-nosdn-nofeature-ha': auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-nosdn-lxd-ha': - auto-trigger-name: 'daily-trigger-disabled' + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-nosdn-lxd-noha': auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-nofeature-ha': @@ -86,6 +83,8 @@ - job-template: name: 'joid-{scenario}-{pod}-daily-{stream}' + disabled: '{obj:disabled}' + concurrent: false properties: @@ -97,7 +96,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'joid-os-.*?-{pod}-daily-{stream}' + - 'joid-os-.*?-{pod}-daily-.*' block-level: 'NODE' wrappers: @@ -153,6 +152,8 @@ - job-template: name: 'joid-deploy-{pod}-daily-{stream}' + disabled: '{obj:disabled}' + concurrent: true properties: @@ -164,7 +165,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'joid-deploy-{pod}-daily-{stream}' + - 'joid-deploy-{pod}-daily-.*' block-level: 'NODE' wrappers: @@ -217,212 +218,181 @@ - trigger: name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 2 * * *' + - timed: '5 2 * * *' - trigger: name: 'joid-os-nosdn-nofeature-ha-virtual-master-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-nosdn-nofeature-ha-orange-pod2-master-trigger' + name: 'joid-os-nosdn-nofeature-ha-orange-pod1-master-trigger' triggers: - timed: '' +# os-nosdn-nofeature-ha trigger - branch: colorado - trigger: - name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-master-trigger' + name: 'joid-os-nosdn-nofeature-ha-baremetal-colorado-trigger' triggers: - - timed: '' - -# os-nosdn-nofeature-ha trigger - branch: stable/brahmaputra -- trigger: - name: 'joid-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger' - triggers: - - timed: '' + - timed: '0 2 * * *' - trigger: - name: 'joid-os-nosdn-nofeature-ha-orange-pod2-brahmaputra-trigger' + name: 'joid-os-nosdn-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-brahmaputra-trigger' + name: 'joid-os-nosdn-nofeature-ha-orange-pod1-colorado-trigger' triggers: - timed: '' - # os-odl_l2-nofeature-ha trigger - branch: master - trigger: name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 10 * * *' + - timed: '5 7 * * *' - trigger: name: 'joid-os-odl_l2-nofeature-ha-virtual-master-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-master-trigger' + name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-master-trigger' triggers: - timed: '' +# os-odl_l2-nofeature-ha trigger - branch: colorado - trigger: - name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-master-trigger' + name: 'joid-os-odl_l2-nofeature-ha-baremetal-colorado-trigger' triggers: - - timed: '' - -# os-odl_l2-nofeature-ha trigger - branch: stable/brahmaputra + - timed: '0 7 * * *' - trigger: - name: 'joid-os-odl_l2-nofeature-ha-baremetal-brahmaputra-trigger' + name: 'joid-os-odl_l2-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger' + name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-colorado-trigger' triggers: - timed: '' -- trigger: - name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-brahmaputra-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-brahmaputra-trigger' - triggers: - - timed: '' - # os-onos-nofeature-ha trigger - branch: master - trigger: name: 'joid-os-onos-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 18 * * *' + - timed: '5 12 * * *' - trigger: name: 'joid-os-onos-nofeature-ha-virtual-master-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-onos-nofeature-ha-orange-pod2-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'joid-os-onos-nofeature-ha-juniper-pod1-master-trigger' + name: 'joid-os-onos-nofeature-ha-orange-pod1-master-trigger' triggers: - timed: '' - -# os-onos-sfc-ha trigger - branch: master -- trigger: - name: 'joid-os-onos-sfc-ha-baremetal-master-trigger' - triggers: - - timed: '0 22 * * *' +# os-onos-nofeature-ha trigger - branch: colorado - trigger: - name: 'joid-os-onos-sfc-ha-virtual-master-trigger' + name: 'joid-os-onos-nofeature-ha-baremetal-colorado-trigger' triggers: - - timed: '' + - timed: '0 12 * * *' - trigger: - name: 'joid-os-onos-sfc-ha-orange-pod2-master-trigger' + name: 'joid-os-onos-nofeature-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-onos-sfc-ha-juniper-pod1-master-trigger' + name: 'joid-os-onos-nofeature-ha-orange-pod1-colorado-trigger' triggers: - timed: '' - -# os-onos-nofeature-ha trigger - branch: stable/brahmaputra +# os-onos-sfc-ha trigger - branch: master - trigger: - name: 'joid-os-onos-nofeature-ha-baremetal-brahmaputra-trigger' + name: 'joid-os-onos-sfc-ha-baremetal-master-trigger' triggers: - - timed: '' + - timed: '5 17 * * *' - trigger: - name: 'joid-os-onos-nofeature-ha-virtual-brahmaputra-trigger' + name: 'joid-os-onos-sfc-ha-virtual-master-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-onos-nofeature-ha-orange-pod2-brahmaputra-trigger' + name: 'joid-os-onos-sfc-ha-orange-pod1-master-trigger' triggers: - timed: '' +# os-onos-sfc-ha trigger - branch: colorado - trigger: - name: 'joid-os-onos-nofeature-ha-juniper-pod1-brahmaputra-trigger' + name: 'joid-os-onos-sfc-ha-baremetal-colorado-trigger' triggers: - - timed: '' + - timed: '0 17 * * *' - trigger: - name: 'joid-os-onos-sfc-ha-baremetal-brahmaputra-trigger' + name: 'joid-os-onos-sfc-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-onos-sfc-ha-virtual-brahmaputra-trigger' + name: 'joid-os-onos-sfc-ha-orange-pod1-colorado-trigger' triggers: - timed: '' +# os-nosdn-lxd-noha trigger - branch: master - trigger: - name: 'joid-os-onos-sfc-ha-orange-pod2-brahmaputra-trigger' + name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger' triggers: - - timed: '' + - timed: '5 22 * * *' - trigger: - name: 'joid-os-onos-sfc-ha-juniper-pod1-brahmaputra-trigger' + name: 'joid-os-nosdn-lxd-noha-virtual-master-trigger' triggers: - timed: '' - -# os-nosdn-lxd-noha trigger - branch: master - trigger: - name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger' + name: 'joid-os-nosdn-lxd-noha-orange-pod1-master-trigger' triggers: - timed: '' +# os-nosdn-lxd-noha trigger - branch: colorado - trigger: - name: 'joid-os-nosdn-lxd-noha-virtual-master-trigger' + name: 'joid-os-nosdn-lxd-noha-baremetal-colorado-trigger' triggers: - - timed: '' + - timed: '0 22 * * *' - trigger: - name: 'joid-os-nosdn-lxd-noha-orange-pod2-master-trigger' + name: 'joid-os-nosdn-lxd-noha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-nosdn-lxd-noha-juniper-pod1-master-trigger' + name: 'joid-os-nosdn-lxd-noha-orange-pod1-colorado-trigger' triggers: - timed: '' - -# os-nosdn-lxd-noha trigger - branch: stable/brahmaputra +# os-nosdn-lxd-ha trigger - branch: master - trigger: - name: 'joid-os-nosdn-lxd-noha-baremetal-brahmaputra-trigger' + name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger' triggers: - - timed: '' + - timed: '5 10 * * *' - trigger: - name: 'joid-os-nosdn-lxd-noha-virtual-brahmaputra-trigger' + name: 'joid-os-nosdn-lxd-ha-virtual-master-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-nosdn-lxd-noha-orange-pod2-brahmaputra-trigger' + name: 'joid-os-nosdn-lxd-ha-orange-pod1-master-trigger' triggers: - timed: '' +# os-nosdn-lxd-ha trigger - branch: colorado - trigger: - name: 'joid-os-nosdn-lxd-noha-juniper-pod1-brahmaputra-trigger' + name: 'joid-os-nosdn-lxd-ha-baremetal-colorado-trigger' triggers: - - timed: '' - -# os-nosdn-lxd-ha trigger - branch: master + - timed: '0 10 * * *' - trigger: - name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger' + name: 'joid-os-nosdn-lxd-ha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-nosdn-lxd-ha-virtual-master-trigger' + name: 'joid-os-nosdn-lxd-ha-orange-pod1-colorado-trigger' triggers: - timed: '' +# os-nosdn-nofeature-noha trigger - branch: master - trigger: - name: 'joid-os-nosdn-lxd-ha-orange-pod2-master-trigger' + name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger' triggers: - - timed: '' + - timed: '5 4 * * *' - trigger: - name: 'joid-os-nosdn-lxd-ha-juniper-pod1-master-trigger' + name: 'joid-os-nosdn-nofeature-noha-virtual-master-trigger' triggers: - timed: '' - -# os-nosdn-lxd-ha trigger - branch: stable/brahmaputra - trigger: - name: 'joid-os-nosdn-lxd-ha-baremetal-brahmaputra-trigger' + name: 'joid-os-nosdn-nofeature-noha-orange-pod1-master-trigger' triggers: - timed: '' +# os-nosdn-nofeature-noha trigger - branch: colorado - trigger: - name: 'joid-os-nosdn-lxd-ha-virtual-brahmaputra-trigger' + name: 'joid-os-nosdn-nofeature-noha-baremetal-colorado-trigger' triggers: - - timed: '' + - timed: '0 4 * * *' - trigger: - name: 'joid-os-nosdn-lxd-ha-orange-pod2-brahmaputra-trigger' + name: 'joid-os-nosdn-nofeature-noha-virtual-colorado-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-nosdn-lxd-ha-juniper-pod1-brahmaputra-trigger' + name: 'joid-os-nosdn-nofeature-noha-orange-pod1-colorado-trigger' triggers: - timed: '' |