X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-ci-jobs.yml;h=e1816b5283d404f803ceacdf9cfe76525e39ee9f;hb=b207face83b614cd7a63e6caafd26d021e910cbe;hp=8c06679a8a0ff15cbfa961e1da1ebac8c3a03031;hpb=ca667bbdceff583e2fd25b311bc63e12a88ae335;p=releng.git

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 8c06679a8..e1816b528 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -26,11 +26,17 @@
     pod:
         - opnfv-jump-2:
             <<: *brahmaputra
+        - ericsson-pod1:
+            <<: *brahmaputra
+        - ericsson-pod2:
+            <<: *brahmaputra
         - virtual:
             <<: *brahmaputra
 #--------------------------------
 #        master
 #--------------------------------
+        - opnfv-jump-2:
+            <<: *master
         - ericsson-pod1:
             <<: *master
         - ericsson-pod2:
@@ -38,26 +44,30 @@
         - virtual:
             <<: *master
 #--------------------------------
-
-# new scenario descriptions
+#       scenarios
+#--------------------------------
     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}-trigger'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l3-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
         - 'os-onos-nofeature-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-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'
-        - 'os-nosdn-kvm_ovs-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-kvm_ovs-ha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-vlan-ha':
-            auto-trigger-name: 'fuel-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         # NOHA scenarios
         - 'os-odl_l2-nofeature-noha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
@@ -75,6 +85,8 @@
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-odl_l2-bgpvpn-noha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+        - 'os-odl_l2-sfc-noha':
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
 
     jobs:
         - 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -86,10 +98,6 @@
 - job-template:
     name: 'fuel-{scenario}-{pod}-daily-{stream}'
 
-    project-type: multijob
-
-    node: intel-build
-
     concurrent: false
 
     properties:
@@ -101,6 +109,7 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'fuel-os-.*?-{pod}-daily-{stream}'
+            block-level: 'NODE'
 
     wrappers:
         - build-name:
@@ -113,6 +122,8 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
+        - '{pod}-defaults':
+            installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
             default: '{scenario}'
@@ -120,30 +131,35 @@
             gs-pathname: '{gs-pathname}'
 
     builders:
-        - multijob:
-            name: deploy
-            condition: SUCCESSFUL
-            projects:
-                - name: 'fuel-deploy-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
-                  kill-phase-on: FAILURE
-        - multijob:
-            name: functest
-            condition: COMPLETED
-            projects:
-                - name: 'functest-fuel-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
-                  kill-phase-on: NEVER
-        - multijob:
-            name: yardstick
-            condition: COMPLETED
-            projects:
-                - name: 'yardstick-fuel-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
-                  kill-phase-on: NEVER
+        - trigger-builds:
+            - project: 'fuel-deploy-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              same-node: true
+              block: true
+        - trigger-builds:
+            - project: 'yardstick-fuel-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              same-node: true
+              block: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+            - project: 'functest-fuel-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              block: true
+              same-node: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'fuel-deploy-{pod}-daily-{stream}'
@@ -159,12 +175,18 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'fuel-deploy-{pod}-daily-{stream}'
+                - 'fuel-deploy-generic-daily-.*'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{pod}-defaults'
         - '{installer}-defaults'
+        - '{pod}-defaults':
+            installer: '{installer}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
         - fuel-ci-parameter:
             gs-pathname: '{gs-pathname}'
 
@@ -206,48 +228,322 @@
             name: GS_URL
             default: artifacts.opnfv.org/$PROJECT{gs-pathname}
             description: "URL to Google Storage."
-- parameter:
-    name: 'virtual-defaults'
-    parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: 'fuel-deploy-virtual'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on these Jenkins Slaves'
 ########################
 # trigger macros
 ########################
+# os-nosdn-nofeature-ha trigger
+# CI PODs
+#-----------------------------------------------
+# LF POD2 Triggers running against master branch
+#-----------------------------------------------
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 0 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 3 * * *'
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 6 * * *'
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 9 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 12 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 15 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 18 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: '0 21 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-master-trigger'
+    triggers:
+        - timed: ''
+#-----------------------------------------------
+# Ericsson POD2 Triggers running against brahmaputra branch
+#-----------------------------------------------
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 12 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 15 * * *'
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 18 * * *'
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 21 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 0 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 3 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 6 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: '0 9 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+#-----------------------------------------------
+# Triggers for other PODs
+#-----------------------------------------------
+- 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-nosdn-nofeature-ha-opnfv-jump-2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+# os-nosdn-kvm-ha trigger
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-master-trigger'
+    triggers:
+        - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-brahmaputra-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-brahmaputra-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-virtual-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
+
+# os-odl_l2-nofeature-ha trigger
 - trigger:
-    name: 'fuel-os-nosdn-vlan-ha-opnfv-jump-2-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vlan-ha-ericsson-pod1-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-master-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- 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-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+# os-odl_l3-nofeature-ha trigger
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- 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-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+# os-onos-nofeature-ha trigger
+- 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-onos-nofeature-ha-opnfv-jump-2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+
+# os-nosdn-ovs-ha trigger
+- 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-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+# os-odl_l2-bgpvpn-ha trigger
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+# os-odl_l2-sfc-ha trigger
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-opnfv-jump-2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod1-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+
+# os-nosdn-kvm-ha trigger
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-ericsson-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-brahmaputra-trigger'
+    triggers:
+        - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vlan-ha-ericsson-pod2-trigger'
+    name: 'fuel-os-nosdn-kvm-noha-ericsson-pod1-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vlan-ha-virtual-trigger'
+    name: 'fuel-os-nosdn-kvm-noha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''