arm-pod1: Updated triggers for arm-pod1 scenarios

[releng.git] / jjb / armband / armband-ci-jobs.yml

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index f9cb1e9..ee84d6f 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -23,23 +23,33 @@
     pod:
         - arm-pod1:
             <<: *brahmaputra
+        - arm-pod2:
+            <<: *brahmaputra
 #--------------------------------
 #        master
 #--------------------------------
-# No master deploys for now
-#        - arm-pod1:
-#            <<: *master
+    pod:
+        - arm-pod1:
+            <<: *master
+        - arm-pod2:
+            <<: *master
 #--------------------------------
 #       scenarios
 #--------------------------------
     scenario:
         # HA scenarios
+        - 'os-nosdn-nofeature-ha':
+            auto-trigger-name: 'daily-trigger-disabled'
         - 'os-odl_l2-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'armband-{scenario}-{pod}-{stream}-trigger'
+        - 'os-odl_l3-nofeature-ha':
+            auto-trigger-name: 'daily-trigger-disabled'
+        - 'os-odl_l2-bgpvpn-ha':
+            auto-trigger-name: 'daily-trigger-disabled'
 
         # NOHA scenarios
         - 'os-odl_l2-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
 
     jobs:
         - 'armband-{scenario}-{pod}-daily-{stream}'
@@ -58,6 +68,7 @@
             enabled: true
             max-total: 1
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -113,6 +124,7 @@
             enabled: true
             max-total: 1
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -178,16 +190,45 @@
 #----------------------------------------------------------
 # Enea Armband POD 1 Triggers running against master branch
 #----------------------------------------------------------
-# No triggers for master for now
 - trigger:
     name: 'armband-os-odl_l2-nofeature-ha-arm-pod1-master-trigger'
     triggers:
-        - timed: ''
-
+        - timed: '0 3 * * 1,4'
+- trigger:
+    name: 'armband-os-nosdn-nofeature-ha-arm-pod1-master-trigger'
+    triggers:
+        - timed: '0 15 * * 1,4'
+- trigger:
+    name: 'armband-os-odl_l3-nofeature-ha-arm-pod1-master-trigger'
+    triggers:
+        - timed: '0 3 * * 2,5'
+- trigger:
+    name: 'armband-os-odl_l2-bgpvpn-ha-arm-pod1-master-trigger'
+    triggers:
+        - timed: '0 15 * * 2,5'
+- trigger:
+    name: 'armband-os-odl_l2-nofeature-noha-arm-pod1-master-trigger'
+    triggers:
+        - timed: '0 3 * * 3,6'
 #---------------------------------------------------------------
 # Enea Armband POD 1 Triggers running against brahmaputra branch
 #---------------------------------------------------------------
 - trigger:
     name: 'armband-os-odl_l2-nofeature-ha-arm-pod1-brahmaputra-trigger'
     triggers:
-        - timed: '0 6 * * *'
+        - timed: ''
+#----------------------------------------------------------
+# Enea Armband POD 2 Triggers running against master branch
+#----------------------------------------------------------
+# No triggers for master for now
+- trigger:
+    name: 'armband-os-odl_l2-nofeature-ha-arm-pod2-master-trigger'
+    triggers:
+        - timed: ''
+#---------------------------------------------------------------
+# Enea Armband POD 2 Triggers running against brahmaputra branch
+#---------------------------------------------------------------
+- trigger:
+    name: 'armband-os-odl_l2-nofeature-ha-arm-pod2-brahmaputra-trigger'
+    triggers:
+        - timed: ''