merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

[releng.git] / jjb / joid / joid-daily-jobs.yml

diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 20429f1..b28dd60 100644 (file)
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -17,10 +17,10 @@
         branch: '{stream}'
         disabled: false
         gs-pathname: ''
-    colorado: &colorado
-        stream: colorado
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
-        disabled: false
+        disabled: true
         gs-pathname: '/{stream}'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
@@ -36,10 +36,10 @@
             <<: *master
         - baremetal:
             slave-label: joid-baremetal
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: joid-virtual
-            <<: *colorado
+            <<: *danube
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -72,6 +72,10 @@
             auto-trigger-name: 'daily-trigger-disabled'
         - 'os-ocl-nofeature-noha':
             auto-trigger-name: 'daily-trigger-disabled'
+        - 'k8-nosdn-nofeature-noha':
+            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+        - 'k8-nosdn-lb-noha':
+            auto-trigger-name: 'daily-trigger-disabled'
 
     jobs:
         - 'joid-{scenario}-{pod}-daily-{stream}'
@@ -88,6 +92,7 @@
     concurrent: false
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 4
@@ -109,6 +114,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - '{installer}-defaults'
         - '{slave-label}-defaults':
             installer: '{installer}'
@@ -157,6 +163,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 4
@@ -178,7 +185,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - '{installer}-defaults'
         - '{slave-label}-defaults':
@@ -226,17 +232,17 @@
     name: 'joid-os-nosdn-nofeature-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-nosdn-nofeature-ha trigger - branch: colorado
+# os-nosdn-nofeature-ha trigger - branch: danube
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-baremetal-colorado-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-baremetal-danube-trigger'
     triggers:
         - timed: '0 2 * * *'
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-virtual-colorado-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-nofeature-ha-orange-pod1-colorado-trigger'
+    name: 'joid-os-nosdn-nofeature-ha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''
 # os-odl_l2-nofeature-ha trigger - branch: master
@@ -252,17 +258,17 @@
     name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-odl_l2-nofeature-ha trigger - branch: colorado
+# os-odl_l2-nofeature-ha trigger - branch: danube
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-baremetal-colorado-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-baremetal-danube-trigger'
     triggers:
         - timed: '0 7 * * *'
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-virtual-colorado-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-colorado-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''
 # os-onos-nofeature-ha trigger - branch: master
@@ -278,17 +284,17 @@
     name: 'joid-os-onos-nofeature-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-onos-nofeature-ha trigger - branch: colorado
+# os-onos-nofeature-ha trigger - branch: danube
 - trigger:
-    name: 'joid-os-onos-nofeature-ha-baremetal-colorado-trigger'
+    name: 'joid-os-onos-nofeature-ha-baremetal-danube-trigger'
     triggers:
         - timed: '0 12 * * *'
 - trigger:
-    name: 'joid-os-onos-nofeature-ha-virtual-colorado-trigger'
+    name: 'joid-os-onos-nofeature-ha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-onos-nofeature-ha-orange-pod1-colorado-trigger'
+    name: 'joid-os-onos-nofeature-ha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''
 # os-onos-sfc-ha trigger - branch: master
@@ -304,17 +310,17 @@
     name: 'joid-os-onos-sfc-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-onos-sfc-ha trigger - branch: colorado
+# os-onos-sfc-ha trigger - branch: danube
 - trigger:
-    name: 'joid-os-onos-sfc-ha-baremetal-colorado-trigger'
+    name: 'joid-os-onos-sfc-ha-baremetal-danube-trigger'
     triggers:
         - timed: '0 17 * * *'
 - trigger:
-    name: 'joid-os-onos-sfc-ha-virtual-colorado-trigger'
+    name: 'joid-os-onos-sfc-ha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-onos-sfc-ha-orange-pod1-colorado-trigger'
+    name: 'joid-os-onos-sfc-ha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''
 # os-nosdn-lxd-noha trigger - branch: master
@@ -330,17 +336,17 @@
     name: 'joid-os-nosdn-lxd-noha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-nosdn-lxd-noha trigger - branch: colorado
+# os-nosdn-lxd-noha trigger - branch: danube
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-baremetal-colorado-trigger'
+    name: 'joid-os-nosdn-lxd-noha-baremetal-danube-trigger'
     triggers:
         - timed: '0 22 * * *'
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-virtual-colorado-trigger'
+    name: 'joid-os-nosdn-lxd-noha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-noha-orange-pod1-colorado-trigger'
+    name: 'joid-os-nosdn-lxd-noha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''
 # os-nosdn-lxd-ha trigger - branch: master
@@ -356,17 +362,17 @@
     name: 'joid-os-nosdn-lxd-ha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-nosdn-lxd-ha trigger - branch: colorado
+# os-nosdn-lxd-ha trigger - branch: danube
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-baremetal-colorado-trigger'
+    name: 'joid-os-nosdn-lxd-ha-baremetal-danube-trigger'
     triggers:
         - timed: '0 10 * * *'
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-virtual-colorado-trigger'
+    name: 'joid-os-nosdn-lxd-ha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-lxd-ha-orange-pod1-colorado-trigger'
+    name: 'joid-os-nosdn-lxd-ha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''
 # os-nosdn-nofeature-noha trigger - branch: master
@@ -382,16 +388,68 @@
     name: 'joid-os-nosdn-nofeature-noha-orange-pod1-master-trigger'
     triggers:
         - timed: ''
-# os-nosdn-nofeature-noha trigger - branch: colorado
+# os-nosdn-nofeature-noha trigger - branch: danube
 - trigger:
-    name: 'joid-os-nosdn-nofeature-noha-baremetal-colorado-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-baremetal-danube-trigger'
     triggers:
         - timed: '0 4 * * *'
 - trigger:
-    name: 'joid-os-nosdn-nofeature-noha-virtual-colorado-trigger'
+    name: 'joid-os-nosdn-nofeature-noha-virtual-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-nosdn-nofeature-noha-orange-pod1-danube-trigger'
+    triggers:
+        - timed: ''
+# k8-nosdn-nofeature-noha trigger - branch: master
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger'
+    triggers:
+        - timed: '5 15 * * *'
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-orange-pod1-master-trigger'
+    triggers:
+        - timed: ''
+# k8-nosdn-nofeature-noha trigger - branch: danube
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-baremetal-danube-trigger'
+    triggers:
+        - timed: '0 15 * * *'
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-virtual-danube-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-k8-nosdn-nofeature-noha-orange-pod1-danube-trigger'
+    triggers:
+        - timed: ''
+# k8-nosdn-lb-noha trigger - branch: master
+- trigger:
+    name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger'
+    triggers:
+        - timed: '5 20 * * *'
+- trigger:
+    name: 'joid-k8-nosdn-lb-noha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-k8-nosdn-lb-noha-orange-pod1-master-trigger'
+    triggers:
+        - timed: ''
+# k8-nosdn-lb-noha trigger - branch: danube
+- trigger:
+    name: 'joid-k8-nosdn-lb-noha-baremetal-danube-trigger'
+    triggers:
+        - timed: '0 20 * * *'
+- trigger:
+    name: 'joid-k8-nosdn-lb-noha-virtual-danube-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'joid-os-nosdn-nofeature-noha-orange-pod1-colorado-trigger'
+    name: 'joid-k8-nosdn-lb-noha-orange-pod1-danube-trigger'
     triggers:
         - timed: ''