Merge "Enable jobs on compass Master and Euphrates"

diff --combined jjb/compass4nfv/compass-ci-jobs.yml
index 8927044,402d3b3..a0d553c
--- 1/jjb/compass4nfv/compass-ci-jobs.yml
--- 2/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@@ -207,24 -207,21 +207,21 @@@
                unstable-threshold: 'FAILURE'
        # dovetail only master by now, not sync with A/B/C branches
        # here the stream means the SUT stream, dovetail stream is defined in its own job
-       # only run on os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha scenario
-       # run against SUT master branch, dovetail docker image with latest tag
-       # run against SUT danube branch, dovetail docker image with latest tag(Monday and Sunday)
-       # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag(Tuesday, Thursday, Friday and Saturday)
+       # only run on os-(nosdn|odl_l2|odl_l3)-nofeature-ha scenario
+       # run against SUT master/euphrates branch, dovetail docker image with latest tag(Monday, Tuesday)
+       # run against SUT master/euphrates branch, dovetail docker image with cvp.X.X.X tag(Thursday, Friday)
+       # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag on huawei-pod7
        - conditional-step:
            condition-kind: and
            condition-operands:
              - condition-kind: regex-match
-               regex: danube
-               label: '{stream}'
-             - condition-kind: regex-match
-               regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
+               regex: os-(nosdn|odl_l3)-nofeature-ha
                label: '{scenario}'
              - condition-kind: day-of-week
                day-selector: select-days
                days:
                  MON: true
-                 SUN: true
+                 TUES: true
                use-build-time: true
            steps:
              - trigger-builds:
@@@ -243,19 -240,13 +240,13 @@@
            condition-kind: and
            condition-operands:
              - condition-kind: regex-match
-               regex: danube
-               label: '{stream}'
-             - condition-kind: regex-match
-               regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
+               regex: os-(nosdn|odl_l3)-nofeature-ha
                label: '{scenario}'
              - condition-kind: day-of-week
                day-selector: select-days
                days:
-                 TUES: true
-                 WED: true
                  THURS: true
                  FRI: true
-                 SAT: true
                use-build-time: true
            steps:
              - trigger-builds:
@@@ -269,27 -260,6 +260,6 @@@
                      build-step-failure-threshold: 'never'
                      failure-threshold: 'never'
                      unstable-threshold: 'FAILURE'
-       - conditional-step:
-           condition-kind: and
-           condition-operands:
-             - condition-kind: regex-match
-               regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
-               label: '{scenario}'
-             - condition-kind: regex-match
-               regex: master
-               label: '{stream}'
-           steps:
-             - trigger-builds:
-                 - project: 'dovetail-compass-{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: and
            condition-operands:
@@@ -568,7 -538,7 +538,7 @@@
  - trigger:
      name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
      triggers:
 -      - timed: '0 20 * * *'
 +      - timed: '0 20 2-30/2 * *'
  - trigger:
      name: 'compass-os-nosdn-openo-ha-baremetal-master-trigger'
      triggers:
@@@ -580,7 -550,7 +550,7 @@@
  - trigger:
      name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
      triggers:
 -      - timed: '0 18 * * *'
 +      - timed: '0 18 1-29/2 * *'
  - trigger:
      name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger'
      triggers:
@@@ -596,15 -566,15 +566,15 @@@
  - trigger:
      name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger'
      triggers:
 -      - timed: '0 12 * * *'
 +      - timed: '0 12 2-30/2 * *'
  - trigger:
      name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger'
      triggers:
 -      - timed: '0 14 * * *'
 +      - timed: '0 14 1-29/2 * *'
  - trigger:
      name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-master-trigger'
      triggers:
 -      - timed: '0 16 * * *'
 +      - timed: '0 16 2-30/2 * *'
  - trigger:
      name: 'compass-k8-nosdn-nofeature-ha-baremetal-master-trigger'
      triggers:
@@@ -612,7 -582,7 +582,7 @@@
  - trigger:
      name: 'compass-os-odl-sfc-ha-baremetal-master-trigger'
      triggers:
 -      - timed: '0 10 * * *'
 +      - timed: '0 10 1-29/2 * *'
  
  # ---------------------
  # noha-baremetal-master
@@@ -648,7 -618,7 +618,7 @@@
  - trigger:
      name: 'compass-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
      triggers:
 -      - timed: '0 1 * * *'
 +      - timed: '0 1 1-29/2 * *'
  - trigger:
      name: 'compass-os-nosdn-openo-ha-baremetal-euphrates-trigger'
      triggers:
@@@ -660,7 -630,7 +630,7 @@@
  - trigger:
      name: 'compass-os-odl_l3-nofeature-ha-baremetal-euphrates-trigger'
      triggers:
 -      - timed: '0 21 * * *'
 +      - timed: '0 21 2-30/2 * *'
  - trigger:
      name: 'compass-os-onos-nofeature-ha-baremetal-euphrates-trigger'
      triggers:
@@@ -676,15 -646,15 +646,15 @@@
  - trigger:
      name: 'compass-os-odl_l2-moon-ha-baremetal-euphrates-trigger'
      triggers:
 -      - timed: '0 5 * * *'
 +      - timed: '0 5 1-29/2 * *'
  - trigger:
      name: 'compass-os-nosdn-kvm-ha-baremetal-euphrates-trigger'
      triggers:
 -      - timed: '0 13 * * *'
 +      - timed: '0 13 2-30/2 * *'
  - trigger:
      name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger'
      triggers:
 -      - timed: '0 9 * * *'
 +      - timed: '0 9 1-29/2 * *'
  - trigger:
      name: 'compass-k8-nosdn-nofeature-ha-baremetal-euphrates-trigger'
      triggers:
@@@ -692,7 -662,7 +662,7 @@@
  - trigger:
      name: 'compass-os-odl-sfc-ha-baremetal-euphrates-trigger'
      triggers:
 -      - timed: '0 17 * * *'
 +      - timed: '0 17 2-30/2 * *'
  
  # ---------------------
  # noha-baremetal-euphrates
@@@ -740,7 -710,7 +710,7 @@@
  - trigger:
      name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
      triggers:
 -      - timed: '0 19 * * *'
 +      - timed: '0 19 2-30/2 * *'
  - trigger:
      name: 'compass-os-onos-nofeature-ha-virtual-master-trigger'
      triggers:
@@@ -756,15 -726,15 +726,15 @@@
  - trigger:
      name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger'
      triggers:
 -      - timed: '30 12 * * *'
 +      - timed: '30 12 1-29/2 * *'
  - trigger:
      name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
      triggers:
 -      - timed: '0 13 * * *'
 +      - timed: '0 13 1-29/2 * *'
  - trigger:
      name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-master-trigger'
      triggers:
 -      - timed: '0 17 * * *'
 +      - timed: '0 17 2-30/2 * *'
  - trigger:
      name: 'compass-k8-nosdn-nofeature-ha-virtual-master-trigger'
      triggers:
@@@ -772,7 -742,7 +742,7 @@@
  - trigger:
      name: 'compass-os-odl-sfc-ha-virtual-master-trigger'
      triggers:
 -      - timed: '0 16 * * *'
 +      - timed: '0 16 2-30/2 * *'
  
  # -------------------
  # noha-virtual-master
@@@ -780,27 -750,27 +750,27 @@@
  - trigger:
      name: 'compass-os-nosdn-kvm-noha-virtual-master-trigger'
      triggers:
 -      - timed: '30 13 * * *'
 +      - timed: '30 13 1-29/2 * *'
  - trigger:
      name: 'compass-os-nosdn-nofeature-noha-virtual-master-trigger'
      triggers:
 -      - timed: '0 14 * * *'
 +      - timed: '0 14 2-30/2 * *'
  - trigger:
      name: 'compass-os-odl_l3-nofeature-noha-virtual-master-trigger'
      triggers:
 -      - timed: '0 15 * * *'
 +      - timed: '0 15 1-29/2 * *'
  - trigger:
      name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger'
      triggers:
 -      - timed: '0 18 * * *'
 +      - timed: '0 18 2-30/2 * *'
  - trigger:
      name: 'compass-os-odl-sfc-noha-virtual-master-trigger'
      triggers:
 -      - timed: '0 20 * * *'
 +      - timed: '0 20 1-29/2 * *'
  - trigger:
      name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger'
      triggers:
 -      - timed: '0 11 * * *'
 +      - timed: '0 11 2-30/2 * *'
  
  # -----------------
  # ha-virtual-euphrates
@@@ -808,7 -778,7 +778,7 @@@
  - trigger:
      name: 'compass-os-nosdn-nofeature-ha-virtual-euphrates-trigger'
      triggers:
 -      - timed: '0 23 * * *'
 +      - timed: '0 23 1-29/2 * *'
  - trigger:
      name: 'compass-os-nosdn-openo-ha-virtual-euphrates-trigger'
      triggers:
@@@ -820,7 -790,7 +790,7 @@@
  - trigger:
      name: 'compass-os-odl_l3-nofeature-ha-virtual-euphrates-trigger'
      triggers:
 -      - timed: '0 22 * * *'
 +      - timed: '0 22 2-30/2 * *'
  - trigger:
      name: 'compass-os-onos-nofeature-ha-virtual-euphrates-trigger'
      triggers:
@@@ -836,23 -806,23 +806,23 @@@
  - trigger:
      name: 'compass-os-odl_l2-moon-ha-virtual-euphrates-trigger'
      triggers:
 -      - timed: '0 20 * * *'
 +      - timed: '0 20 1-29/2 * *'
  - trigger:
      name: 'compass-os-nosdn-kvm-ha-virtual-euphrates-trigger'
      triggers:
 -      - timed: '0 16 * * *'
 +      - timed: '0 16 2-30/2 * *'
  - trigger:
      name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger'
      triggers:
 -      - timed: '0 14 * * *'
 +      - timed: '0 14 1-29/2 * *'
  - trigger:
      name: 'compass-os-odl-sfc-ha-virtual-euphrates-trigger'
      triggers:
 -      - timed: '0 18 * * *'
 +      - timed: '0 18 2-30/2 * *'
  - trigger:
      name: 'compass-k8-nosdn-nofeature-ha-virtual-euphrates-trigger'
      triggers:
 -      - timed: '5 1 * * *'
 +      - timed: '5 1 2-30/2 * *'
  
  # -------------------
  # noha-virtual-euphrates
@@@ -860,24 -830,24 +830,24 @@@
  - trigger:
      name: 'compass-os-nosdn-kvm-noha-virtual-euphrates-trigger'
      triggers:
 -      - timed: '0 15 * * *'
 +      - timed: '0 15 1-29/2 * *'
  - trigger:
      name: 'compass-os-nosdn-nofeature-noha-virtual-euphrates-trigger'
      triggers:
 -      - timed: '0 17 * * *'
 +      - timed: '0 17 2-30/2 * *'
  - trigger:
      name: 'compass-os-odl_l3-nofeature-noha-virtual-euphrates-trigger'
      triggers:
 -      - timed: '0 23 * * *'
 +      - timed: '0 23 1-29/2 * *'
  - trigger:
      name: 'compass-os-odl_l2-moon-noha-virtual-euphrates-trigger'
      triggers:
 -      - timed: '0 21 * * *'
 +      - timed: '0 21 2-30/2 * *'
  - trigger:
      name: 'compass-os-odl-sfc-noha-virtual-euphrates-trigger'
      triggers:
 -      - timed: '0 19 * * *'
 +      - timed: '0 19 1-29/2 * *'
  - trigger:
      name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger'
      triggers:
 -      - timed: '0 12 * * *'
 +      - timed: '0 12 2-30/2 * *'