fuel: Adjust build blockers and reconfigure generic-deploy job

[releng.git] / jjb / fuel / fuel-ci-jobs.yml

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 0fb5c7c..45065f8 100644 (file)
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -45,11 +45,14 @@
     scenario:
         # HA scenarios
         - 'os-onos-nofeature-ha':
-            auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+#            auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-odl_l2-nofeature-ha':
-            auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-odl_l3-nofeature-ha':
-            auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+            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'
         - 'os-nosdn-kvm-ha':
@@ -99,6 +102,7 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'fuel-os-.*?-{pod}-daily-{stream}'
+            block-level: 'NODE'
 
     wrappers:
         - build-name:
@@ -164,6 +168,8 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'fuel-deploy-{pod}-daily-{stream}'
+                - 'fuel-deploy-generic-daily-.*'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
@@ -271,3 +277,21 @@
     name: 'fuel-os-odl_l3-nofeature-ha-virtual-trigger'
     triggers:
         - timed: ''
+
+# os-odl_l2-bgpvpn-ha trigger
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-trigger'
+    triggers:
+        - timed: '0 8 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-trigger'
+    triggers:
+        - timed: ''