fuel: Enable and readjust triggers

Change-Id: Ia675e594d30c727c6584aff97e17f7a108c3f209
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 45503d1..e1816b5 100644 (file)
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -48,22 +48,22 @@
 #--------------------------------
     scenario:
         # HA scenarios
+        - 'os-nosdn-nofeature-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l2-nofeature-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l3-nofeature-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-onos-nofeature-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+        - 'os-odl_l2-bgpvpn-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+        - 'os-odl_l2-sfc-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-kvm-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-ovs-ha':
             auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
-        - 'os-nosdn-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-odl_l2-bgpvpn-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-odl_l2-sfc-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-kvm_ovs-ha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-vlan-ha':