summaryrefslogtreecommitdiffstats
path: root/jjb/joid
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/joid')
-rw-r--r--jjb/joid/joid-daily-jobs.yml66
-rw-r--r--jjb/joid/joid-verify-jobs.yml2
2 files changed, 34 insertions, 34 deletions
diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 947b2f1ab..1e92fbfef 100644
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -13,8 +13,8 @@
# -------------------------------
# BRANCH ANCHORS
# -------------------------------
- euphrates: &euphrates
- stream: euphrates
+ fraser: &fraser
+ stream: fraser
branch: 'stable/{stream}'
disabled: false
gs-pathname: '/{stream}'
@@ -31,7 +31,7 @@
pod:
- baremetal:
slave-label: joid-baremetal
- <<: *euphrates
+ <<: *fraser
- baremetal:
slave-label: joid-baremetal
<<: *master
@@ -232,9 +232,9 @@
########################
# trigger macros
########################
-# os-nosdn-nofeature-ha trigger - branch: euphrates
+# os-nosdn-nofeature-ha trigger - branch: fraser
- trigger:
- name: 'joid-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
+ name: 'joid-os-nosdn-nofeature-ha-baremetal-fraser-trigger'
triggers:
- timed: '5 2 * * *'
# os-nosdn-nofeature-ha trigger - branch: master
@@ -242,9 +242,9 @@
name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger'
triggers:
- timed: '5 2 * * *'
-# os-odl_l2-nofeature-ha trigger - branch: euphrates
+# os-odl_l2-nofeature-ha trigger - branch: fraser
- trigger:
- name: 'joid-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger'
+ name: 'joid-os-odl_l2-nofeature-ha-baremetal-fraser-trigger'
triggers:
- timed: '5 7 * * *'
# os-odl_l2-nofeature-ha trigger - branch: master
@@ -252,9 +252,9 @@
name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger'
triggers:
- timed: '5 7 * * *'
-# os-nosdn-lxd-noha trigger - branch: euphrates
+# os-nosdn-lxd-noha trigger - branch: fraser
- trigger:
- name: 'joid-os-nosdn-lxd-noha-baremetal-euphrates-trigger'
+ name: 'joid-os-nosdn-lxd-noha-baremetal-fraser-trigger'
triggers:
- timed: '5 22 * * *'
# os-nosdn-lxd-noha trigger - branch: master
@@ -262,9 +262,9 @@
name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger'
triggers:
- timed: '5 22 * * *'
-# os-nosdn-lxd-ha trigger - branch: euphrates
+# os-nosdn-lxd-ha trigger - branch: fraser
- trigger:
- name: 'joid-os-nosdn-lxd-ha-baremetal-euphrates-trigger'
+ name: 'joid-os-nosdn-lxd-ha-baremetal-fraser-trigger'
triggers:
- timed: '5 10 * * *'
# os-nosdn-lxd-ha trigger - branch: master
@@ -272,9 +272,9 @@
name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger'
triggers:
- timed: '5 10 * * *'
-# os-nosdn-nofeature-noha trigger - branch: euphrates
+# os-nosdn-nofeature-noha trigger - branch: fraser
- trigger:
- name: 'joid-os-nosdn-nofeature-noha-baremetal-euphrates-trigger'
+ name: 'joid-os-nosdn-nofeature-noha-baremetal-fraser-trigger'
triggers:
- timed: '5 4 * * *'
# os-nosdn-nofeature-noha trigger - branch: master
@@ -282,9 +282,9 @@
name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger'
triggers:
- timed: '5 4 * * *'
-# k8-nosdn-nofeature-noha trigger - branch: euphrates
+# k8-nosdn-nofeature-noha trigger - branch: fraser
- trigger:
- name: 'joid-k8-nosdn-nofeature-noha-baremetal-euphrates-trigger'
+ name: 'joid-k8-nosdn-nofeature-noha-baremetal-fraser-trigger'
triggers:
- timed: '5 15 * * *'
# k8-nosdn-nofeature-noha trigger - branch: master
@@ -292,9 +292,9 @@
name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger'
triggers:
- timed: '5 15 * * *'
-# k8-nosdn-lb-noha trigger - branch: euphrates
+# k8-nosdn-lb-noha trigger - branch: fraser
- trigger:
- name: 'joid-k8-nosdn-lb-noha-baremetal-euphrates-trigger'
+ name: 'joid-k8-nosdn-lb-noha-baremetal-fraser-trigger'
triggers:
- timed: '5 20 * * *'
# k8-nosdn-lb-noha trigger - branch: master
@@ -302,9 +302,9 @@
name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger'
triggers:
- timed: '5 20 * * *'
-# k8-ovn-lb-noha trigger - branch: euphrates
+# k8-ovn-lb-noha trigger - branch: fraser
- trigger:
- name: 'joid-k8-ovn-lb-noha-baremetal-euphrates-trigger'
+ name: 'joid-k8-ovn-lb-noha-baremetal-fraser-trigger'
triggers:
- timed: '5 17 * * *'
# k8-ovn-lb-noha trigger - branch: master
@@ -312,9 +312,9 @@
name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger'
triggers:
- timed: '5 17 * * *'
-# os-nosdn-openbaton-ha trigger - branch: euphrates
+# os-nosdn-openbaton-ha trigger - branch: fraser
- trigger:
- name: 'joid-os-nosdn-openbaton-ha-baremetal-euphrates-trigger'
+ name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger'
triggers:
- timed: '5 23 * * *'
# os-nosdn-openbaton-ha trigger - branch: master
@@ -322,9 +322,9 @@
name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
triggers:
- timed: '5 23 * * *'
-# os-ocl-nofeature-ha trigger - branch: euphrates
+# os-ocl-nofeature-ha trigger - branch: fraser
- trigger:
- name: 'joid-os-ocl-nofeature-ha-baremetal-euphrates-trigger'
+ name: 'joid-os-ocl-nofeature-ha-baremetal-fraser-trigger'
triggers:
- timed: '5 13 * * *'
# os-ocl-nofeature-ha trigger - branch: master
@@ -332,9 +332,9 @@
name: 'joid-os-ocl-nofeature-ha-baremetal-master-trigger'
triggers:
- timed: '5 13 * * *'
-# os-ocl-nofeature-noha trigger - branch: euphrates
+# os-ocl-nofeature-noha trigger - branch: fraser
- trigger:
- name: 'joid-os-ocl-nofeature-noha-baremetal-euphrates-trigger'
+ name: 'joid-os-ocl-nofeature-noha-baremetal-fraser-trigger'
triggers:
- timed: '5 16 * * *'
# os-ocl-nofeature-noha trigger - branch: master
@@ -342,9 +342,9 @@
name: 'joid-os-ocl-nofeature-noha-baremetal-master-trigger'
triggers:
- timed: '5 16 * * *'
-# k8-canal-lb-noha trigger - branch: euphrates
+# k8-canal-lb-noha trigger - branch: fraser
- trigger:
- name: 'joid-k8-canal-lb-noha-baremetal-euphrates-trigger'
+ name: 'joid-k8-canal-lb-noha-baremetal-fraser-trigger'
triggers:
- timed: '5 14 * * *'
# k8-canal-lb-noha trigger - branch: master
@@ -352,9 +352,9 @@
name: 'joid-k8-canal-lb-noha-baremetal-master-trigger'
triggers:
- timed: '5 14 * * *'
-# k8-multus-lb-noha trigger - branch: euphrates
+# k8-multus-lb-noha trigger - branch: fraser
- trigger:
- name: 'joid-k8-multus-lb-noha-baremetal-euphrates-trigger'
+ name: 'joid-k8-multus-lb-noha-baremetal-fraser-trigger'
triggers:
- timed: '5 18 * * *'
# k8-multus-lb-noha trigger - branch: master
@@ -362,9 +362,9 @@
name: 'joid-k8-multus-lb-noha-baremetal-master-trigger'
triggers:
- timed: '5 18 * * *'
-# k8-nosdn-lb_ceph-noha trigger - branch: euphrates
+# k8-nosdn-lb_ceph-noha trigger - branch: fraser
- trigger:
- name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-euphrates-trigger'
+ name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-fraser-trigger'
triggers:
- timed: '5 18 * * *'
# k8-nosdn-lb_ceph-noha trigger - branch: master
@@ -372,9 +372,9 @@
name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-master-trigger'
triggers:
- timed: '5 18 * * *'
-# os-ovn-nofeature-ha trigger - branch: euphrates
+# os-ovn-nofeature-ha trigger - branch: fraser
- trigger:
- name: 'joid-os-ovn-nofeature-ha-baremetal-euphrates-trigger'
+ name: 'joid-os-ovn-nofeature-ha-baremetal-fraser-trigger'
triggers:
- timed: '5 19 * * *'
# os-ovn-nofeature-ha trigger - branch: master
diff --git a/jjb/joid/joid-verify-jobs.yml b/jjb/joid/joid-verify-jobs.yml
index 53bc3f38a..2d1c7c9f3 100644
--- a/jjb/joid/joid-verify-jobs.yml
+++ b/jjb/joid/joid-verify-jobs.yml
@@ -13,7 +13,7 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - euphrates:
+ - fraser: &fraser
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false