X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Farmband%2Farmband-ci-jobs.yml;h=f6b48656a042520ccbfd6d90038fa54303af18b2;hb=6230297636c44a4a8b67d65c7222098f77228713;hp=bbf7c40a43f3f716e320a14f08bc1083bfa852f6;hpb=dc711fd45b5dd54ec6d478b5fcd26d89568597a0;p=releng.git

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index bbf7c40a4..f6b48656a 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -2,7 +2,6 @@
 - project:
     name: 'armband-ci'
     project: 'armband'
-    installer: 'fuel'
 
 #--------------------------------
 # BRANCH ANCHORS
@@ -11,57 +10,93 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
-    brahmaputra: &brahmaputra
-        stream: brahmaputra
+    colorado: &colorado
+        stream: colorado
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
-#        brahmaputra
+# CI POD's
+#--------------------------------
+#        colorado
 #--------------------------------
     pod:
-        - arm-pod1:
-            <<: *brahmaputra
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            <<: *colorado
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            <<: *colorado
+#--------------------------------
+#        master
+#--------------------------------
+        - armband-baremetal:
+            slave-label: armband-baremetal
+            installer: fuel
+            <<: *master
+        - armband-virtual:
+            slave-label: armband-virtual
+            installer: fuel
+            <<: *master
+#--------------------------------
+# NONE-CI POD's
+#--------------------------------
+#        colorado
+#--------------------------------
+        - arm-pod2:
+            slave-label: arm-pod2
+            installer: fuel
+            <<: *colorado
 #--------------------------------
 #        master
 #--------------------------------
-# No master deploys for now
-#        - arm-pod1:
-#            <<: *master
+        - arm-pod2:
+            slave-label: arm-pod2
+            installer: fuel
+            <<: *master
 #--------------------------------
 #       scenarios
 #--------------------------------
     scenario:
         # HA scenarios
+        - 'os-nosdn-nofeature-ha':
+            auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l2-nofeature-ha':
-            auto-trigger-name: 'armband-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+        - 'os-odl_l3-nofeature-ha':
+            auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+        - 'os-odl_l2-bgpvpn-ha':
+            auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
 
         # NOHA scenarios
         - 'os-odl_l2-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
-        - 'armband-{scenario}-{pod}-daily-{stream}'
-        - 'armband-deploy-{pod}-daily-{stream}'
+        - '{installer}-{scenario}-{pod}-daily-{stream}'
+        - '{installer}-deploy-{pod}-daily-{stream}'
 
 ########################
 # job templates
 ########################
 - job-template:
-    name: 'armband-{scenario}-{pod}-daily-{stream}'
+    name: '{installer}-{scenario}-{pod}-daily-{stream}'
 
     concurrent: false
 
     properties:
         - throttle:
             enabled: true
-            max-total: 1
+            max-total: 4
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'armband-os-.*?-{pod}-daily-{stream}'
+                - '{installer}-os-.*?-{pod}-daily-.*'
             block-level: 'NODE'
 
     wrappers:
@@ -75,7 +110,7 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults':
+        - '{slave-label}-defaults':
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
@@ -85,7 +120,7 @@
 
     builders:
         - trigger-builds:
-            - project: 'armband-deploy-{pod}-daily-{stream}'
+            - project: '{installer}-deploy-{pod}-daily-{stream}'
               current-parameters: false
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}
@@ -102,29 +137,41 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
+        - trigger-builds:
+            - project: 'yardstick-{installer}-{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: 'armband-deploy-{pod}-daily-{stream}'
+    name: '{installer}-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:
-                - 'armband-deploy-{pod}-daily-{stream}'
-                - 'armband-deploy-generic-daily-.*'
+                - '{installer}-deploy-{pod}-daily-{stream}'
+                - '{installer}-deploy-generic-daily-.*'
             block-level: 'NODE'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults':
+        - '{slave-label}-defaults':
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
@@ -150,7 +197,7 @@
 
     publishers:
         - email:
-            recipients: josep.puigdemont@enea.com armband@enea.com
+            recipients: armband@enea.com
 
 ########################
 # parameter macros
@@ -175,19 +222,141 @@
 # trigger macros
 ########################
 # CI PODs
+#-----------------------------------------------------------------
+# Enea Armband CI Baremetal Triggers running against master branch
+#-----------------------------------------------------------------
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-master-trigger'
+    triggers:
+        - timed: '0 0 * * 1'
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger'
+    triggers:
+        - timed: '0 0 * * 2'
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-master-trigger'
+    triggers:
+        - timed: '0 0 * * 3'
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-master-trigger'
+    triggers:
+        - timed: '0 0 * * 4'
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-master-trigger'
+    triggers:
+        - timed: '0 0 * * 5'
+#----------------------------------------------------------------------
+# Enea Armband CI Baremetal Triggers running against colorado branch
+#----------------------------------------------------------------------
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-armband-baremetal-colorado-trigger'
+    triggers:
+        - timed: '0 4 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-colorado-trigger'
+    triggers:
+        - timed: '0 8 * * *'
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-colorado-trigger'
+    triggers:
+        - timed: '0 12 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-armband-baremetal-colorado-trigger'
+    triggers:
+        - timed: '0 16 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-noha-armband-baremetal-colorado-trigger'
+    triggers:
+        - timed: '0 20 * * *'
+#---------------------------------------------------------------
+# Enea Armband CI Virtual Triggers running against master branch
+#---------------------------------------------------------------
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-armband-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-armband-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-master-trigger'
+    triggers:
+        - timed: ''
+#--------------------------------------------------------------------
+# Enea Armband CI Virtual Triggers running against colorado branch
+#--------------------------------------------------------------------
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-armband-virtual-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-armband-virtual-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-noha-armband-virtual-colorado-trigger'
+    triggers:
+        - timed: ''
 #----------------------------------------------------------
-# Enea Armband POD 1 Triggers running against master branch
+# Enea Armband POD 2 Triggers running against master branch
 #----------------------------------------------------------
-# No triggers for master for now
 - trigger:
-    name: 'armband-os-odl_l2-nofeature-ha-arm-pod1-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-arm-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-arm-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-arm-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-master-trigger'
     triggers:
         - timed: ''
-
 #---------------------------------------------------------------
-# Enea Armband POD 1 Triggers running against brahmaputra branch
+# Enea Armband POD 2 Triggers running against colorado branch
 #---------------------------------------------------------------
 - trigger:
-    name: 'armband-os-odl_l2-nofeature-ha-arm-pod1-brahmaputra-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-arm-pod2-colorado-trigger'
     triggers:
-        - timed: '0 20 * * *'
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-arm-pod2-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-arm-pod2-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-arm-pod2-colorado-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-noha-arm-pod2-colorado-trigger'
+    triggers:
+        - timed: ''