X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Farmband%2Farmband-ci-jobs.yml;h=0bf750be36d16ebc99ac74b784cb6764506f44e1;hb=f960c2faf09b61c47d8086f2b046c1258016c710;hp=767187de54a3aa15440c21534f7955bcf26145b1;hpb=6977c4f63ee17be70d90a5b800e3d9cde0ea33c2;p=releng.git

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 767187de5..0bf750be3 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
       # -------------------------------
@@ -62,6 +62,8 @@
           auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
       - 'os-odl-nofeature-ha':
           auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+      - 'os-ovn-nofeature-ha':
+          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
       - 'os-nosdn-ovs-ha':
           auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
 
@@ -124,42 +126,28 @@
               DEPLOY_SCENARIO={scenario}
             same-node: true
             block: true
-      - conditional-step:
-          condition-kind: not
-          condition-operand:
-            condition-kind: regex-match
-            regex: 'danube'
-            label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'functest-{installer}-{pod}-arm-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'
-      - conditional-step:
-          condition-kind: not
-          condition-operand:
-            condition-kind: regex-match
-            regex: 'danube'
-            label: '{stream}'
-          steps:
-            - 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'
+      - trigger-builds:
+          - project: 'functest-{installer}-{pod}-arm-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-{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'
       # 1.here the stream means the SUT stream, dovetail stream is defined in its own job
       # 2.testsuite proposed_tests here is for new test cases planning to add into OVP
       # 3.run proposed_tests on Monday, Wednesday and Friday against ha scenario
@@ -171,7 +159,7 @@
           condition-kind: and
           condition-operands:
             - condition-kind: regex-match
-              regex: '*-ha'
+              regex: '.*-ha'
               label: '{scenario}'
             - condition-kind: day-of-week
               day-selector: select-days
@@ -196,7 +184,7 @@
           condition-kind: and
           condition-operands:
             - condition-kind: regex-match
-              regex: '*-ha'
+              regex: '.*-ha'
               label: '{scenario}'
             - condition-kind: day-of-week
               day-selector: select-days
@@ -262,6 +250,7 @@
           gs-pathname: '{gs-pathname}'
       - '{slave-label}-defaults':
           installer: '{installer}'
+      - testapi-parameter
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-odl-nofeature-ha'
@@ -274,6 +263,7 @@
           name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     builders:
+      - track-begin-timestamp
       - shell:
           !include-raw-escape: ../fuel/fuel-deploy.sh
 
@@ -281,6 +271,7 @@
       - email:
           recipients: armband@enea.com
       - email-jenkins-admins-on-failure
+      - report-provision-result
 
 ########################
 # trigger macros
@@ -301,29 +292,37 @@
     name: 'fuel-os-odl-nofeature-ha-armband-baremetal-master-trigger'
     triggers:
       - timed: '0 1 * * 2,5,7'
+- trigger:
+    name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-master-trigger'
+    triggers:
+      - timed: ''
 - trigger:
     name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-master-trigger'
     triggers:
       - timed: '0 1 * * 1,3'
 # ---------------------------------------------------------------------
-# 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 * * 4,6'
 - 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 * * 2,5,7'
 - 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 * * 1,3'
 
 # --------------------------------------------------------------
 # Enea Armband CI Virtual Triggers running against master branch
@@ -340,26 +339,34 @@
     name: 'fuel-os-odl-nofeature-ha-armband-virtual-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-ovn-nofeature-ha-armband-virtual-master-trigger'
+    triggers:
+      - timed: ''
 - trigger:
     name: 'fuel-os-nosdn-ovs-ha-armband-virtual-master-trigger'
     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: ''