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 91fcc88..b28dd60 100644 (file)
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -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':
@@ -395,3 +401,55 @@
     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-k8-nosdn-lb-noha-orange-pod1-danube-trigger'
+    triggers:
+        - timed: ''