summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/joid/joid-daily-jobs.yml116
1 files changed, 113 insertions, 3 deletions
diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 569bff293..92f7a3414 100644
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -18,6 +18,11 @@
branch: 'stable/{stream}'
disabled: false
gs-pathname: '/{stream}'
+ master: &master
+ stream: master
+ branch: '{stream}'
+ disabled: false
+ gs-pathname: ''
# -------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
# -------------------------------
@@ -27,7 +32,9 @@
- baremetal:
slave-label: joid-baremetal
<<: *euphrates
-
+ - baremetal:
+ slave-label: joid-baremetal
+ <<: *master
# -------------------------------
# scenarios
# -------------------------------
@@ -56,6 +63,14 @@
auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
- 'os-nosdn-openbaton-ha':
auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+ - 'k8-canal-lb-noha':
+ auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+ - 'k8-nosdn-lb_ceph-noha':
+ auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+ - 'k8-multus-lb-noha':
+ auto-trigger-name: 'daily-trigger-disabled'
+ - 'os-ovn-nofeature-ha':
+ auto-trigger-name: 'daily-trigger-disabled'
jobs:
- 'joid-{scenario}-{pod}-daily-{stream}'
@@ -222,53 +237,148 @@
name: 'joid-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
triggers:
- timed: '5 2 * * *'
+# os-nosdn-nofeature-ha trigger - branch: master
+- trigger:
+ name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 2 * * *'
# os-odl_l2-nofeature-ha trigger - branch: euphrates
- trigger:
name: 'joid-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger'
triggers:
- timed: '5 7 * * *'
+# os-odl_l2-nofeature-ha trigger - branch: master
+- trigger:
+ name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 7 * * *'
# os-nosdn-lxd-noha trigger - branch: euphrates
- trigger:
name: 'joid-os-nosdn-lxd-noha-baremetal-euphrates-trigger'
triggers:
- timed: '5 22 * * *'
+# os-nosdn-lxd-noha trigger - branch: master
+- trigger:
+ name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 22 * * *'
# os-nosdn-lxd-ha trigger - branch: euphrates
- trigger:
name: 'joid-os-nosdn-lxd-ha-baremetal-euphrates-trigger'
triggers:
- timed: '5 10 * * *'
+# os-nosdn-lxd-ha trigger - branch: master
+- trigger:
+ name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 10 * * *'
# os-nosdn-nofeature-noha trigger - branch: euphrates
- trigger:
name: 'joid-os-nosdn-nofeature-noha-baremetal-euphrates-trigger'
triggers:
- timed: '5 4 * * *'
+# os-nosdn-nofeature-noha trigger - branch: master
+- trigger:
+ name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 4 * * *'
# k8-nosdn-nofeature-noha trigger - branch: euphrates
- trigger:
name: 'joid-k8-nosdn-nofeature-noha-baremetal-euphrates-trigger'
triggers:
- timed: '5 15 * * *'
+# k8-nosdn-nofeature-noha trigger - branch: master
+- trigger:
+ name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 15 * * *'
# k8-nosdn-lb-noha trigger - branch: euphrates
- trigger:
name: 'joid-k8-nosdn-lb-noha-baremetal-euphrates-trigger'
triggers:
- timed: '5 20 * * *'
+# k8-nosdn-lb-noha trigger - branch: master
+- trigger:
+ name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 20 * * *'
# k8-ovn-lb-noha trigger - branch: euphrates
- trigger:
name: 'joid-k8-ovn-lb-noha-baremetal-euphrates-trigger'
triggers:
- timed: '5 17 * * *'
+# k8-ovn-lb-noha trigger - branch: master
+- trigger:
+ name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 17 * * *'
# os-nosdn-openbaton-ha trigger - branch: euphrates
- trigger:
name: 'joid-os-nosdn-openbaton-ha-baremetal-euphrates-trigger'
triggers:
- timed: '5 25 * * *'
+# os-nosdn-openbaton-ha trigger - branch: master
+- trigger:
+ name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 25 * * *'
# os-ocl-nofeature-ha trigger - branch: euphrates
- trigger:
name: 'joid-os-ocl-nofeature-ha-baremetal-euphrates-trigger'
triggers:
- timed: '5 13 * * *'
-# os-ocl-nofeature-ha trigger - branch: euphrates
+# os-ocl-nofeature-ha trigger - branch: master
+- trigger:
+ name: 'joid-os-ocl-nofeature-ha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 13 * * *'
+# os-ocl-nofeature-noha trigger - branch: euphrates
- trigger:
name: 'joid-os-ocl-nofeature-noha-baremetal-euphrates-trigger'
triggers:
- - timed: '5 17 * * *'
+ - timed: '5 16 * * *'
+# os-ocl-nofeature-noha trigger - branch: master
+- trigger:
+ name: 'joid-os-ocl-nofeature-noha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 16 * * *'
+# k8-canal-lb-noha trigger - branch: euphrates
+- trigger:
+ name: 'joid-k8-canal-lb-noha-baremetal-euphrates-trigger'
+ triggers:
+ - timed: '5 14 * * *'
+# k8-canal-lb-noha trigger - branch: master
+- trigger:
+ name: 'joid-k8-canal-lb-noha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 14 * * *'
+# k8-multus-lb-noha trigger - branch: euphrates
+- trigger:
+ name: 'joid-k8-multus-lb-noha-baremetal-euphrates-trigger'
+ triggers:
+ - timed: '5 18 * * *'
+# k8-multus-lb-noha trigger - branch: master
+- trigger:
+ name: 'joid-k8-multus-lb-noha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 18 * * *'
+# k8-nosdn-lb_ceph-noha trigger - branch: euphrates
+- trigger:
+ name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-euphrates-trigger'
+ triggers:
+ - timed: '5 18 * * *'
+# k8-nosdn-lb_ceph-noha trigger - branch: master
+- trigger:
+ name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 18 * * *'
+# os-ovn-nofeature-ha trigger - branch: euphrates
+- trigger:
+ name: 'joid-os-ovn-nofeature-ha-baremetal-euphrates-trigger'
+ triggers:
+ - timed: '5 19 * * *'
+# os-ovn-nofeature-ha trigger - branch: master
+- trigger:
+ name: 'joid-os-ovn-nofeature-ha-baremetal-master-trigger'
+ triggers:
+ - timed: '5 19 * * *'