fuel: Switch PODs for branches

[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 cf42135..9893b13 100644 (file)
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -28,6 +28,8 @@
             <<: *brahmaputra
         - ericsson-pod1:
             <<: *brahmaputra
+        - ericsson-pod2:
+            <<: *brahmaputra
         - virtual:
             <<: *brahmaputra
 #--------------------------------
@@ -44,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}-{stream}-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}-{stream}-trigger'
+        - 'os-onos-nofeature-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-nosdn-kvm-ha':
+            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: 'fuel-{scenario}-{pod}-{stream}-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
@@ -102,6 +103,7 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'fuel-os-.*?-{pod}-daily-{stream}'
+            block-level: 'NODE'
 
     wrappers:
         - build-name:
@@ -167,6 +169,8 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'fuel-deploy-{pod}-daily-{stream}'
+                - 'fuel-deploy-generic-daily-.*'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
@@ -221,74 +225,207 @@
 ########################
 # trigger macros
 ########################
-# os-onos3-nofeature-ha trigger
+# os-nosdn-nofeature-ha trigger
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 2 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-brahmaputra-trigger'
     triggers:
-        - timed: '0 20 * * *'
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 2 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+# os-nosdn-kvm-ha trigger
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 6 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-virtual-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 6 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
 
 # os-odl_l2-nofeature-ha trigger
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 10 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-master-trigger'
     triggers:
-        - timed: '0 0 * * *'
+        - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-virtual-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-virtual-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 10 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
 
 # os-odl_l3-nofeature-ha trigger
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 4 * * *'
+        - timed: '0 14 * * *'
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-virtual-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 14 * * *'
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
 
-# os-odl_l2-bgpvpn-ha trigger
+# os-onos-nofeature-ha trigger
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-trigger'
+    name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger'
     triggers:
-        - timed: '0 8 * * *'
+        - timed: '0 18 * * *'
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-trigger'
+    name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-trigger'
+    name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-trigger'
+    name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 18 * * *'
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+
+# os-nosdn-ovs-ha trigger
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 22 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 22 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''