X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-ci-jobs.yml;h=e78be54b71b6d531ea7dd7360b1598fcb6d253c4;hb=e7d7573b9bc086783b6067d5b394e4e1d4de5933;hp=cf421356a1bb4bcda725eb3524f46f4ee1e8fa98;hpb=f9ab51ed8dab386e41c5e9659f9249b4b7ca7922;p=releng.git

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index cf421356a..e78be54b7 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -18,68 +18,56 @@
         stream: brahmaputra
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
+        auto-trigger-name: 'daily-trigger-disabled'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
-#        brahmaputra
+#        CI PODs
 #--------------------------------
     pod:
-        - opnfv-jump-2:
-            <<: *brahmaputra
-        - ericsson-pod1:
+        - baremetal:
+            slave-label: fuel-baremetal
+            <<: *master
+        - virtual:
+            slave-label: fuel-virtual
+            <<: *master
+        - baremetal:
+            slave-label: fuel-baremetal
             <<: *brahmaputra
         - virtual:
+            slave-label: fuel-virtual
             <<: *brahmaputra
 #--------------------------------
-#        master
+#        None-CI PODs
 #--------------------------------
-        - ericsson-pod1:
-            <<: *master
-        - ericsson-pod2:
-            <<: *master
-        - virtual:
+        - zte-pod1:
+            slave-label: zte-pod1
             <<: *master
 #--------------------------------
 #       scenarios
 #--------------------------------
     scenario:
         # HA scenarios
-        - 'os-onos-nofeature-ha':
-#            auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+        - 'os-nosdn-nofeature-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-odl_l2-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-odl_l3-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+        - 'os-onos-sfc-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+        - 'os-onos-nofeature-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+        - 'os-odl_l2-sfc-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - '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}-daily-{stream}-trigger'
         - 'os-nosdn-kvm-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-nosdn-kvm_ovs-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-nosdn-ovs-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-nosdn-vlan-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        # NOHA scenarios
-        - 'os-odl_l2-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-odl_l3-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-onos-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-nosdn-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-nosdn-kvm-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-nosdn-kvm_ovs-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-nosdn-ovs-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-odl_l2-bgpvpn-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+        - 'os-nosdn-kvm_ovs-ha':
+            auto-trigger-name: 'daily-trigger-disabled'
 
     jobs:
         - 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -96,12 +84,14 @@
     properties:
         - throttle:
             enabled: true
-            max-total: 1
+            max-total: 4
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
                 - 'fuel-os-.*?-{pod}-daily-{stream}'
+            block-level: 'NODE'
 
     wrappers:
         - build-name:
@@ -114,7 +104,7 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults':
+        - '{slave-label}-defaults':
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
@@ -131,7 +121,7 @@
               same-node: true
               block: true
         - trigger-builds:
-            - project: 'functest-fuel-{pod}-daily-{stream}'
+            - project: 'yardstick-fuel-{pod}-daily-{stream}'
               current-parameters: false
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}
@@ -142,7 +132,7 @@
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
         - trigger-builds:
-            - project: 'yardstick-fuel-{pod}-daily-{stream}'
+            - project: 'functest-fuel-{pod}-daily-{stream}'
               current-parameters: false
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}
@@ -153,26 +143,33 @@
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
 
+    publishers:
+        - email:
+            recipients: peter.barabas@ericsson.com
+
 - job-template:
     name: 'fuel-deploy-{pod}-daily-{stream}'
 
-    concurrent: false
+    concurrent: true
 
     properties:
         - throttle:
             enabled: true
-            max-total: 1
+            max-total: 4
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
                 - 'fuel-deploy-{pod}-daily-{stream}'
+                - 'fuel-deploy-generic-daily-.*'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults':
+        - '{slave-label}-defaults':
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
@@ -198,7 +195,7 @@
 
     publishers:
         - email:
-            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
+            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com peter.barabas@ericsson.com
 
 ########################
 # parameter macros
@@ -221,74 +218,130 @@
 ########################
 # trigger macros
 ########################
-# os-onos3-nofeature-ha trigger
+# os-nosdn-nofeature-ha trigger
+# CI PODs
+#-----------------------------------------------
+# Triggers for job running on fuel-baremetal against master branch
+#-----------------------------------------------
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
         - timed: '0 20 * * *'
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 0 * * *'
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 4 * * *'
+- trigger:
+    name: 'fuel-os-onos-sfc-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 8 * * *'
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 12 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 16 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-virtual-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
-
-# os-odl_l2-nofeature-ha trigger
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-trigger'
+    name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-master-trigger'
     triggers:
-        - timed: '0 0 * * *'
+        - timed: ''
+#-----------------------------------------------
+# Triggers for job running on fuel-virtual against master branch
+#-----------------------------------------------
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-virtual-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-virtual-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-virtual-daily-master-trigger'
     triggers:
         - timed: ''
-
-# os-odl_l3-nofeature-ha trigger
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-trigger'
+    name: 'fuel-os-onos-sfc-ha-virtual-daily-master-trigger'
     triggers:
-        - timed: '0 4 * * *'
+        - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-trigger'
+    name: 'fuel-os-onos-nofeature-ha-virtual-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-virtual-trigger'
+    name: 'fuel-os-odl_l2-sfc-ha-virtual-daily-master-trigger'
     triggers:
         - timed: ''
-
-# os-odl_l2-bgpvpn-ha trigger
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-virtual-daily-master-trigger'
     triggers:
-        - timed: '0 8 * * *'
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-virtual-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-virtual-daily-master-trigger'
+    triggers:
+        - timed: ''
+#-----------------------------------------------
+# ZTE POD1 Triggers running against master branch
+#-----------------------------------------------
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-zte-pod1-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-zte-pod1-daily-master-trigger'
+    triggers:
+        - timed: '0 12 * * *'
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-zte-pod1-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-onos-sfc-ha-zte-pod1-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-zte-pod1-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod1-daily-master-trigger'
+    triggers:
+        - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-trigger'
+    name: 'fuel-os-odl_l2-sfc-ha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''