fuel: Adjust triggers for available scenarios

os-nosdn-nofeature-ha   : 10:00, every day for both branches
os-nosdn-ovs-ha         : 16:00, every day for both branches
os-odl_l2-bgpvpn-ha     : 22:00, every day for both branches
os-odl_l3-nofeature-ha  : 04:00, every day for both branches
os-nosdn-kvm-noha (virt): 00:00/12:00 every day for stable/brahmaputra
                          06:00/18:00 every day for master
os-odl_l2-nofeature-ha  : 01:00, every 5th day for both branches
os-onos-nofeature-ha    : 13:00, every 5th day for both branches
os-nosdn-kvm-ha   (bm)  : disabled

os-odl_l2-nofeature-ha and os-onos-nofeature-ha have passed the
release criteria and frequency of runs have been reduced to leave
time for running other scenarios.

os-nosdn-nofeature-ha is kept as it is as reference purposes.

Change-Id: Iabc25b2d0bc441bfb08028647f8c7b497dab2632
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 1080cd2..a7c7de0 100644 (file)
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -61,7 +61,7 @@
         - 'os-nosdn-nofeature-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l2-bgpvpn-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-kvm_ovs-ha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-vlan-ha':
@@ -76,7 +76,7 @@
         - 'os-nosdn-nofeature-noha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-kvm-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-kvm_ovs-noha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-ovs-noha':
@@ -231,7 +231,7 @@
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 14 * * *'
+        - timed: '0 10 * * *'
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-master-trigger'
     triggers:
@@ -255,7 +255,7 @@
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
     triggers:
-        - timed: '0 14 * * *'
+        - timed: '0 10 * * *'
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
@@ -265,7 +265,7 @@
 - trigger:
     name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 18 * * *'
+        - timed: ''
 - trigger:
     name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-master-trigger'
     triggers:
@@ -289,7 +289,7 @@
 - trigger:
     name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-brahmaputra-trigger'
     triggers:
-        - timed: '0 18 * * *'
+        - timed: ''
 - trigger:
     name: 'fuel-os-nosdn-kvm-ha-virtual-brahmaputra-trigger'
     triggers:
@@ -299,7 +299,7 @@
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: '0 1 * * */5'
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-master-trigger'
     triggers:
@@ -323,7 +323,7 @@
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: '0 1 * * */5'
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
@@ -333,7 +333,7 @@
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 6 * * *'
+        - timed: '0 4 * * *'
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-master-trigger'
     triggers:
@@ -357,7 +357,7 @@
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
     triggers:
-        - timed: '0 6 * * *'
+        - timed: '0 4 * * *'
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
@@ -367,7 +367,7 @@
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 10 * * */4'
+        - timed: '0 13 * * */5'
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-master-trigger'
     triggers:
@@ -391,7 +391,7 @@
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
     triggers:
-        - timed: '0 10 * * */4'
+        - timed: '0 13 * * */5'
 - trigger:
     name: 'fuel-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
@@ -402,7 +402,7 @@
 - trigger:
     name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 22 * * *'
+        - timed: '0 16 * * *'
 - trigger:
     name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-master-trigger'
     triggers:
@@ -426,8 +426,76 @@
 - trigger:
     name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger'
     triggers:
-        - timed: '0 22 * * *'
+        - timed: '0 16 * * *'
 - trigger:
     name: 'fuel-os-nosdn-ovs-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
+
+# os-odl_l2-bgpvpn-ha trigger
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 22 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 22 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+# os-nosdn-kvm-ha trigger
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-ericsson-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-virtual-master-trigger'
+    triggers:
+        - timed: '0 6,18 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-ericsson-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: '0 0,12 * * *'