Merge "Bugfix of the wrong regrex for Dovetail Jobs"

diff --combined jjb/armband/armband-ci-jobs.yml
index 1661fc3,329414e..d95ca4f
--- 1/jjb/armband/armband-ci-jobs.yml
--- 2/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@@ -62,8 -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'
  
@@@ -71,10 -69,6 +71,10 @@@
        - '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}'
@@@ -177,7 -171,7 +177,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
@@@ -202,7 -196,7 +202,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
@@@ -307,10 -301,6 +307,10 @@@
      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:
@@@ -350,10 -340,6 +350,10 @@@
      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:

diff --combined jjb/fuel/fuel-daily-jobs.yml
index d4f225a,fea3da5..b9120b0
--- 1/jjb/fuel/fuel-daily-jobs.yml
--- 2/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@@ -63,8 -63,6 +63,8 @@@
            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
        - 'os-onos-nofeature-ha':
            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
 +      - 'os-ovn-nofeature-ha':
 +          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
        - 'os-nosdn-kvm-ha':
            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
        - 'os-nosdn-ovs-ha':
@@@ -103,14 -101,6 +103,14 @@@
          stream: master
        - scenario: os-odl_l2-bgpvpn-ha
          stream: euphrates
 +      - scenario: os-ovn-nofeature-noha
 +        stream: danube
 +      - scenario: os-ovn-nofeature-noha
 +        stream: euphrates
 +      - scenario: os-ovn-nofeature-ha
 +        stream: danube
 +      - scenario: os-ovn-nofeature-ha
 +        stream: euphrates
  
      jobs:
        - 'fuel-{scenario}-{pod}-daily-{stream}'
@@@ -217,7 -207,7 +217,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
@@@ -242,7 -232,7 +242,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
@@@ -405,10 -395,6 +405,10 @@@
      name: 'fuel-os-onos-nofeature-ha-baremetal-daily-master-trigger'
      triggers:
        - timed: ''  # '5 8 * * *'
 +- trigger:
 +    name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-master-trigger'
 +    triggers:
 +      - timed: ''
  - trigger:
      name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-master-trigger'
      triggers:
@@@ -511,6 -497,10 +511,6 @@@
      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 -536,6 +546,10 @@@
      name: 'fuel-os-onos-nofeature-ha-virtual-daily-master-trigger'
      triggers:
        - timed: ''
 +- trigger:
 +    name: 'fuel-os-ovn-nofeature-ha-virtual-daily-master-trigger'
 +    triggers:
 +      - timed: ''
  - trigger:
      name: 'fuel-os-nosdn-kvm-ha-virtual-daily-master-trigger'
      triggers:
@@@ -655,6 -641,10 +655,6 @@@
      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 -680,6 +690,10 @@@
      name: 'fuel-os-onos-nofeature-ha-zte-pod1-daily-master-trigger'
      triggers:
        - timed: ''
 +- trigger:
 +    name: 'fuel-os-ovn-nofeature-ha-zte-pod1-daily-master-trigger'
 +    triggers:
 +      - timed: ''
  - trigger:
      name: 'fuel-os-nosdn-kvm-ha-zte-pod1-daily-master-trigger'
      triggers: