releng-macros: Update & adopt email-fuel-ptl

[releng.git] / jjb / fuel / fuel-daily-jobs.yaml

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 7110dae..8850965 100644 (file)
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -86,6 +86,8 @@
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-ovn-nofeature-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+      - 'os-odl-ovs-noha':
+          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-nosdn-kvm-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-nosdn-ovs-noha':
@@ -107,6 +109,8 @@
         stream: danube
       - scenario: os-ovn-nofeature-ha
         stream: danube
+      - scenario: os-odl-ovs-noha
+        stream: fraser
 
     jobs:
       - 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -190,27 +194,19 @@
               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
-      # 4.testsuite default here is for the test cases already added into OVP
-      # 5.run default testsuite on Tuesday against ha scenario
-      # 6.not used for release criteria or compliance, only to debug the dovetail tool bugs
+      # 2.testsuite default here is for the test cases already added into OVP
+      # 3.run default testsuite mandatory test cases against ha scenario
+      # 4.run default testsuite optional test cases against ha scenario
+      # 5.not used for release criteria or compliance, only to debug the dovetail tool bugs
       - conditional-step:
           condition-kind: and
           condition-operands:
             - condition-kind: regex-match
               regex: '.*-ha'
               label: '{scenario}'
-            - condition-kind: day-of-week
-              day-selector: select-days
-              days:
-                MON: true
-                WED: true
-                FRI: true
-              use-build-time: true
           steps:
             - trigger-builds:
-                - project: 'dovetail-fuel-{pod}-proposed_tests-{stream}'
+                - project: 'dovetail-fuel-{pod}-default-mandatory-{stream}'
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
@@ -226,14 +222,9 @@
             - condition-kind: regex-match
               regex: '.*-ha'
               label: '{scenario}'
-            - condition-kind: day-of-week
-              day-selector: select-days
-              days:
-                TUES: true
-              use-build-time: true
           steps:
             - trigger-builds:
-                - project: 'dovetail-fuel-{pod}-default-{stream}'
+                - project: 'dovetail-fuel-{pod}-default-optional-{stream}'
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
@@ -263,8 +254,7 @@
                     unstable-threshold: 'FAILURE'
 
     publishers:
-      - email:
-          recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
+      - email-fuel-ptl
       - email-jenkins-admins-on-failure
 
 - job-template:
@@ -320,8 +310,7 @@
           !include-raw-escape: ./fuel-deploy.sh
 
     publishers:
-      - email:
-          recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
+      - email-fuel-ptl
       - email-jenkins-admins-on-failure
       - report-provision-result
 
@@ -427,6 +416,10 @@
     name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-odl-ovs-noha-baremetal-daily-master-trigger'
+    triggers:
+      - timed: ''
 - trigger:
     name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-master-trigger'
     triggers:
@@ -580,6 +573,10 @@
     name: 'fuel-os-ovn-nofeature-noha-virtual-daily-master-trigger'
     triggers:
       - timed: '5 23 * * *'
+- trigger:
+    name: 'fuel-os-odl-ovs-noha-virtual-daily-master-trigger'
+    triggers:
+      - timed: '5 2 * * *'
 - trigger:
     name: 'fuel-os-nosdn-kvm-noha-virtual-daily-master-trigger'
     triggers:
@@ -732,6 +729,10 @@
     name: 'fuel-os-ovn-nofeature-noha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-odl-ovs-noha-zte-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
 - trigger:
     name: 'fuel-os-nosdn-kvm-noha-zte-pod1-daily-master-trigger'
     triggers: