X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Farmband%2Farmband-ci-jobs.yml;h=f8ed35283c4f96d1941ed1be34e2d609cd68417b;hb=3d7d641703203eea25150519976fee93708b3741;hp=23bb641191acd8bcd3492e998cb478998a7586d6;hpb=11b4765aa2219b4b1ec2019612c0bf113813af2f;p=releng.git

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 23bb64119..f8ed35283 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -16,7 +16,18 @@
       stream: euphrates
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
-      disabled: true
+      disabled: false
+    # -------------------------------
+    # DEPLOY TYPE ANCHORS
+    # -------------------------------
+    baremetal: &baremetal
+      installer: 'fuel'
+      deploy-type: 'baremetal'
+      slave-label: 'armband-{deploy-type}'
+    virtual: &virtual
+      installer: 'fuel'
+      deploy-type: 'virtual'
+      slave-label: 'armband-{deploy-type}'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -26,23 +37,19 @@
     # -------------------------------
     pod:
       - armband-baremetal:
-          slave-label: armband-baremetal
-          installer: fuel
+          <<: *baremetal
           <<: *euphrates
       - armband-virtual:
-          slave-label: armband-virtual
-          installer: fuel
+          <<: *virtual
           <<: *euphrates
       # -------------------------------
       #        master
       # -------------------------------
       - armband-baremetal:
-          slave-label: armband-baremetal
-          installer: fuel
+          <<: *baremetal
           <<: *master
       - armband-virtual:
-          slave-label: armband-virtual
-          installer: fuel
+          <<: *virtual
           <<: *master
     # -------------------------------
     #       scenarios
@@ -136,7 +143,8 @@
               failure-threshold: 'never'
               unstable-threshold: 'FAILURE'
       # 1.dovetail only master, based on D release
-      # 2.here the stream means the SUT stream, dovetail stream is defined in its own job
+      # 2.here the stream means the SUT stream,
+      #   dovetail stream is defined in its own job
       # 3.only proposed_tests testsuite here(refstack, ha, ipv6, bgpvpn)
       # 4.not used for release criteria or compliance,
       #   only to debug the dovetail tool bugs with arm pods
@@ -147,7 +155,7 @@
           label: '{scenario}'
           steps:
             - trigger-builds:
-                - project: 'dovetail-{installer}-{pod}-proposed_tests-{stream}'
+                - project: 'dovetail-{installer}-{pod}-proposed_tests-master'
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
@@ -157,6 +165,16 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
+      # Armband uses Fuel's log collection project job, no need to duplicate
+      - trigger-builds:
+          - project: 'fuel-collect-logs-{deploy-type}-daily-{stream}'
+            current-parameters: false
+            block: true
+            same-node: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
 
 - job-template:
     name: '{installer}-deploy-{pod}-daily-{stream}'
@@ -215,7 +233,7 @@
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger'
     triggers:
-      - timed: '0 1 * * *'
+      - timed: '0 16 * * 2,4,6'
 - trigger:
     name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-master-trigger'
     triggers:
@@ -223,14 +241,14 @@
 - trigger:
     name: 'fuel-os-odl-nofeature-ha-armband-baremetal-master-trigger'
     triggers:
-      - timed: '0 16 * * *'
+      - timed: '0 16 * * 1,3,5,7'
 # ---------------------------------------------------------------------
 # Enea Armband CI Baremetal Triggers running against euphrates branch
 # ---------------------------------------------------------------------
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-euphrates-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 1 * * 2,4,6'
 - trigger:
     name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-euphrates-trigger'
     triggers:
@@ -238,7 +256,7 @@
 - trigger:
     name: 'fuel-os-odl-nofeature-ha-armband-baremetal-euphrates-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 1 * * 1,3,5,7'
 # --------------------------------------------------------------
 # Enea Armband CI Virtual Triggers running against master branch
 # --------------------------------------------------------------