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 8c06679..45065f8 100644 (file)
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -26,6 +26,8 @@
     pod:
         - opnfv-jump-2:
             <<: *brahmaputra
+        - ericsson-pod1:
+            <<: *brahmaputra
         - virtual:
             <<: *brahmaputra
 #--------------------------------
@@ -38,15 +40,18 @@
         - virtual:
             <<: *master
 #--------------------------------
-
-# new scenario descriptions
+#       scenarios
+#--------------------------------
     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: 'fuel-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-odl_l3-nofeature-ha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-onos-nofeature-ha':
+        - 'os-odl_l2-bgpvpn-ha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-nosdn-nofeature-ha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
@@ -57,7 +62,7 @@
         - 'os-nosdn-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'
@@ -86,10 +91,6 @@
 - job-template:
     name: 'fuel-{scenario}-{pod}-daily-{stream}'
 
-    project-type: multijob
-
-    node: intel-build
-
     concurrent: false
 
     properties:
@@ -101,6 +102,7 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'fuel-os-.*?-{pod}-daily-{stream}'
+            block-level: 'NODE'
 
     wrappers:
         - build-name:
@@ -113,6 +115,8 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
+        - '{pod}-defaults':
+            installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
             default: '{scenario}'
@@ -120,30 +124,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: 'functest-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: 'yardstick-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 +168,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 +221,77 @@
             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-onos3-nofeature-ha trigger
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-trigger'
+    triggers:
+        - timed: '0 20 * * *'
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-virtual-trigger'
+    triggers:
+        - timed: ''
+
+# os-odl_l2-nofeature-ha trigger
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: '0 0 * * *'
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: ''
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: ''
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-virtual-trigger'
     triggers:
         - timed: ''
+
+# os-odl_l3-nofeature-ha trigger
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-trigger'
+    triggers:
+        - timed: '0 4 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-vlan-ha-opnfv-jump-2-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vlan-ha-ericsson-pod1-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: ''
+- trigger:
+    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-nosdn-vlan-ha-ericsson-pod2-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vlan-ha-virtual-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-trigger'
     triggers:
         - timed: ''