From: mei mei <meimei@huawei.com>
Date: Thu, 28 Dec 2017 01:26:18 +0000 (+0000)
Subject: Merge "Enable dovetail daily jobs on Fuel/armband Euphrates and master"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=79715f619ee9f6b83b84bafd04f9b07ac3a78f2d;hp=-c;p=releng.git

Merge "Enable dovetail daily jobs on Fuel/armband Euphrates and master"
---

79715f619ee9f6b83b84bafd04f9b07ac3a78f2d
diff --combined jjb/fuel/fuel-daily-jobs.yml
index 98ae4f3e3,a11f3995a..902e75499
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@@ -85,8 -85,6 +85,8 @@@
            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
        - 'os-onos-nofeature-noha':
            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
 +      - 'os-ovn-nofeature-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':
@@@ -200,34 -198,21 +200,21 @@@
                      build-step-failure-threshold: 'never'
                      failure-threshold: 'never'
                      unstable-threshold: 'FAILURE'
-       # 1.dovetail only has master, based on D release
-       # 2.here the stream means the SUT stream, dovetail stream is defined in its own job
-       # 3.only debug testsuite here(refstack, ha, ipv6, bgpvpn)
-       # 4.not used for release criteria or compliance,
-       #   only to debug the dovetail tool bugs with bgpvpn and nosdn-nofeature
-       # 5.only run against scenario os-odl-bgpvpn-ha(regex used here, can extend to more scenarios future)
-       # 6.ZTE pod1, os-nosdn-nofeature-ha and os-odl-bgpvpn-ha, run against danube
-       - conditional-step:
-           condition-kind: and
-           condition-operands:
-             - condition-kind: regex-match
-               regex: os-(nosdn-nofeature|odl_l2-bgpvpn)-ha
-               label: '{scenario}'
-             - condition-kind: regex-match
-               regex: 'danube'
-               label: '{stream}'
-           steps:
-             - trigger-builds:
-                 - project: 'dovetail-fuel-{pod}-proposed_tests-master'
-                   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.only debug testsuite here(refstack, ha, vping, ipv6, tempest, bgpvpn)
+       # 3.not used for release criteria or compliance, only to debug the dovetail tool bugs
+       # 4.ZTE pod1, os-nosdn-nofeature-ha and os-odl-bgpvpn-ha, run against danube
+       - trigger-builds:
+           - project: 'dovetail-fuel-{pod}-proposed_tests-{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:
@@@ -401,10 -386,6 +388,10 @@@
      name: 'fuel-os-onos-nofeature-noha-baremetal-daily-master-trigger'
      triggers:
        - timed: ''
 +- trigger:
 +    name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-master-trigger'
 +    triggers:
 +      - timed: ''
  - trigger:
      name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-master-trigger'
      triggers:
@@@ -474,10 -455,6 +461,10 @@@
      name: 'fuel-os-onos-nofeature-noha-baremetal-daily-euphrates-trigger'
      triggers:
        - timed: ''
 +- trigger:
 +    name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-euphrates-trigger'
 +    triggers:
 +      - timed: ''
  - trigger:
      name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-euphrates-trigger'
      triggers:
@@@ -546,10 -523,6 +533,10 @@@
      name: 'fuel-os-onos-nofeature-noha-virtual-daily-master-trigger'
      triggers:
        - timed: ''  # '5 23 * * *'
 +- trigger:
 +    name: 'fuel-os-ovn-nofeature-noha-virtual-daily-master-trigger'
 +    triggers:
 +      - timed: '5 23 * * *'
  - trigger:
      name: 'fuel-os-nosdn-kvm-noha-virtual-daily-master-trigger'
      triggers:
@@@ -618,10 -591,6 +605,10 @@@
      name: 'fuel-os-onos-nofeature-noha-virtual-daily-euphrates-trigger'
      triggers:
        - timed: ''  # '0 23 * * *'
 +- trigger:
 +    name: 'fuel-os-ovn-nofeature-noha-virtual-daily-euphrates-trigger'
 +    triggers:
 +      - timed: ''
  - trigger:
      name: 'fuel-os-nosdn-kvm-noha-virtual-daily-euphrates-trigger'
      triggers:
@@@ -690,10 -659,6 +677,10 @@@
      name: 'fuel-os-onos-nofeature-noha-zte-pod1-daily-master-trigger'
      triggers:
        - timed: ''
 +- trigger:
 +    name: 'fuel-os-ovn-nofeature-noha-zte-pod1-daily-master-trigger'
 +    triggers:
 +      - timed: ''
  - trigger:
      name: 'fuel-os-nosdn-kvm-noha-zte-pod1-daily-master-trigger'
      triggers:
@@@ -762,10 -727,6 +749,10 @@@
      name: 'fuel-os-onos-nofeature-noha-zte-pod1-daily-euphrates-trigger'
      triggers:
        - timed: ''
 +- trigger:
 +    name: 'fuel-os-ovn-nofeature-noha-zte-pod1-daily-euphrates-trigger'
 +    triggers:
 +      - timed: ''
  - trigger:
      name: 'fuel-os-nosdn-kvm-noha-zte-pod1-daily-euphrates-trigger'
      triggers: