X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Farmband%2Farmband-ci-jobs.yml;h=b8ffc16fa72888ba4fc3bc2fdfa005ae82c34f04;hb=7d99dc08b6913d2a0202b092c184c364872b891e;hp=1c5f148809e993327903a8d46486f62ca89f8825;hpb=588a3ff5cd44a212c3ba3ec8bba2cdee24b50a87;p=releng.git

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 1c5f14880..b8ffc16fa 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -12,8 +12,8 @@
       branch: '{stream}'
       gs-pathname: ''
       disabled: false
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
       disabled: false
@@ -33,16 +33,16 @@
     # -------------------------------
     # CI POD's
     # -------------------------------
-    #        euphrates
+    #        fraser
     # -------------------------------
     pod:
       # yamllint disable rule:key-duplicates
       - armband-baremetal:
           <<: *baremetal
-          <<: *euphrates
+          <<: *fraser
       - armband-virtual:
           <<: *virtual
-          <<: *euphrates
+          <<: *fraser
       # -------------------------------
       #        master
       # -------------------------------
@@ -71,10 +71,6 @@
       - 'os-nosdn-nofeature-noha':
           auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
 
-    exclude:
-      - scenario: os-ovn-nofeature-ha
-        stream: euphrates
-
     jobs:
       - '{installer}-{scenario}-{pod}-daily-{stream}'
       - '{installer}-deploy-{pod}-daily-{stream}'
@@ -168,9 +164,7 @@
             - condition-kind: day-of-week
               day-selector: select-days
               days:
-                MON: true
-                WED: true
-                FRI: true
+                SAT: true
               use-build-time: true
           steps:
             - trigger-builds:
@@ -193,7 +187,7 @@
             - condition-kind: day-of-week
               day-selector: select-days
               days:
-                TUES: true
+                SUN: true
               use-build-time: true
           steps:
             - trigger-builds:
@@ -254,6 +248,7 @@
           gs-pathname: '{gs-pathname}'
       - '{slave-label}-defaults':
           installer: '{installer}'
+      - testapi-parameter
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-odl-nofeature-ha'
@@ -266,6 +261,7 @@
           name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     builders:
+      - track-begin-timestamp
       - shell:
           !include-raw-escape: ../fuel/fuel-deploy.sh
 
@@ -273,6 +269,7 @@
       - email:
           recipients: armband@enea.com
       - email-jenkins-admins-on-failure
+      - report-provision-result
 
 ########################
 # trigger macros
@@ -284,7 +281,7 @@
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger'
     triggers:
-      - timed: '0 1 * * 4,6'
+      - timed: '0 1 * * 1'
 - trigger:
     name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-master-trigger'
     triggers:
@@ -292,7 +289,7 @@
 - trigger:
     name: 'fuel-os-odl-nofeature-ha-armband-baremetal-master-trigger'
     triggers:
-      - timed: '0 1 * * 2,5,7'
+      - timed: '0 1 * * 3,7'
 - trigger:
     name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-master-trigger'
     triggers:
@@ -300,26 +297,30 @@
 - trigger:
     name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-master-trigger'
     triggers:
-      - timed: '0 1 * * 1,3'
+      - timed: '0 1 * * 4'
 # ---------------------------------------------------------------------
-# Enea Armband CI Baremetal Triggers running against euphrates branch
+# Enea Armband CI Baremetal Triggers running against fraser branch
 # ---------------------------------------------------------------------
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-euphrates-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-fraser-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 1 * * 2'
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-euphrates-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-armband-baremetal-euphrates-trigger'
+    name: 'fuel-os-odl-nofeature-ha-armband-baremetal-fraser-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 1 * * 5'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-euphrates-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-fraser-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-fraser-trigger'
+    triggers:
+      - timed: '0 1 * * 6'
 
 # --------------------------------------------------------------
 # Enea Armband CI Virtual Triggers running against master branch
@@ -345,21 +346,25 @@
     triggers:
       - timed: ''
 # -------------------------------------------------------------------
-# Enea Armband CI Virtual Triggers running against euphrates branch
+# Enea Armband CI Virtual Triggers running against fraser branch
 # -------------------------------------------------------------------
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-euphrates-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-fraser-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-euphrates-trigger'
+    name: 'fuel-os-odl-nofeature-ha-armband-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-armband-virtual-euphrates-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-armband-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-armband-virtual-euphrates-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-armband-virtual-fraser-trigger'
     triggers:
       - timed: ''