1 files changed, 63 insertions, 27 deletions

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 33c54eced..c65451804 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -46,23 +46,22 @@
 #--------------------------------
     scenario:
         # HA scenarios
-        - 'os-onos-nofeature-ha':
-#            auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-odl_l2-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
         - 'os-odl_l3-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-odl_l2-bgpvpn-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-nosdn-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+        - 'os-onos-nofeature-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
         - 'os-nosdn-kvm-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+        - 'os-nosdn-ovs-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+        - 'os-nosdn-nofeature-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+        - 'os-odl_l2-bgpvpn-ha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-kvm_ovs-ha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-nosdn-ovs-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-vlan-ha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         # NOHA scenarios
@@ -226,21 +225,39 @@
 ########################
 # trigger macros
 ########################
-# os-onos3-nofeature-ha trigger
+# os-nosdn-nofeature-ha trigger
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-trigger'
     triggers:
-        - timed: '0 20 * * *'
+        - timed: '0 2 * * *'
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-trigger'
+    triggers:
+        - timed: '0 2 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-virtual-trigger'
     triggers:
         - timed: ''
+
+# os-nosdn-kvm-ha trigger
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-virtual-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-trigger'
+    triggers:
+        - timed: '0 6 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-trigger'
+    triggers:
+        - timed: '0 6 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-virtual-trigger'
     triggers:
         - timed: ''
 
@@ -248,7 +265,7 @@
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-trigger'
     triggers:
-        - timed: '0 0 * * *'
+        - timed: '0 10 * * *'
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-trigger'
     triggers:
@@ -256,7 +273,7 @@
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 10 * * *'
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-virtual-trigger'
     triggers:
@@ -266,7 +283,7 @@
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-trigger'
     triggers:
-        - timed: '0 4 * * *'
+        - timed: '0 14 * * *'
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-trigger'
     triggers:
@@ -274,26 +291,45 @@
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 14 * * *'
 - trigger:
     name: 'fuel-os-odl_l3-nofeature-ha-virtual-trigger'
     triggers:
         - timed: ''
 
-# os-odl_l2-bgpvpn-ha trigger
+# os-onos-nofeature-ha trigger
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-trigger'
+    triggers:
+        - timed: '0 18 * * *'
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-trigger'
+    triggers:
+        - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-trigger'
+    name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-trigger'
     triggers:
-        - timed: '0 8 * * *'
+        - timed: '0 18 * * *'
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-trigger'
+    name: 'fuel-os-onos-nofeature-ha-virtual-trigger'
     triggers:
         - timed: ''
+
+
+# os-nosdn-ovs-ha trigger
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-trigger'
+    triggers:
+        - timed: '0 22 * * *'
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-trigger'
+    triggers:
+        - timed: '0 22 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-virtual-trigger'
     triggers:
         - timed: ''