Merge "[Compass4nfv] add nosdn-bar-ha scenario"

diff --combined jjb/compass4nfv/compass-ci-jobs.yml
index 4e58234,5c5feee..9f333aa
--- 1/jjb/compass4nfv/compass-ci-jobs.yml
--- 2/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@@ -54,7 -54,7 +54,7 @@@
        #        master
        # -------------------------------
        - baremetal-centos:
 -          slave-label: 'intel-pod8'
 +          slave-label: 'intel-pod17'
            os-version: 'centos7'
            <<: *master
        # -------------------------------
@@@ -120,6 -120,9 +120,9 @@@
        - 'os-nosdn-ovs_dpdk-noha':
            disabled: false
            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+       - 'os-nosdn-bar-ha':
+           disabled: false
+           auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
  
      jobs:
        - 'compass-{scenario}-{pod}-daily-{stream}'
@@@ -207,21 -210,24 +210,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:
@@@ -240,13 -246,19 +243,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:
@@@ -262,6 -274,27 +265,6 @@@
                      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:
              - condition-kind: regex-match
                regex: os-nosdn-nofeature-ha
@@@ -423,6 -456,10 +426,10 @@@
      name: 'compass-k8-nosdn-nofeature-ha-baremetal-centos-master-trigger'
      triggers:
        - timed: ''
+ - trigger:
+     name: 'compass-os-nosdn-bar-ha-baremetal-centos-master-trigger'
+     triggers:
+       - timed: ''  # '0 19 * * *'
  
  # ----------------------------
  # noha-baremetal-centos-master
@@@ -503,6 -540,10 +510,10 @@@
      name: 'compass-k8-nosdn-nofeature-ha-huawei-pod7-danube-trigger'
      triggers:
        - timed: ''
+ - trigger:
+     name: 'compass-os-nosdn-bar-ha-huawei-pod7-danube-trigger'
+     triggers:
+       - timed: ''  # '0 19 * * *'
  
  # ----------------------------
  # noha-huawei-pod7-danube
@@@ -583,6 -624,10 +594,10 @@@
      name: 'compass-os-odl-sfc-ha-baremetal-master-trigger'
      triggers:
        - timed: '0 10 1-29/2 * *'
+ - trigger:
+     name: 'compass-os-nosdn-bar-ha-baremetal-master-trigger'
+     triggers:
+       - timed: '0 2 2-30/2 * *'
  
  # ---------------------
  # noha-baremetal-master
@@@ -663,6 -708,10 +678,10 @@@
      name: 'compass-os-odl-sfc-ha-baremetal-euphrates-trigger'
      triggers:
        - timed: '0 17 2-30/2 * *'
+ - trigger:
+     name: 'compass-os-nosdn-bar-ha-baremetal-euphrates-trigger'
+     triggers:
+       - timed: '0 21 1-29/2 * *'
  
  # ---------------------
  # noha-baremetal-euphrates
@@@ -743,6 -792,10 +762,10 @@@
      name: 'compass-os-odl-sfc-ha-virtual-master-trigger'
      triggers:
        - timed: '0 16 2-30/2 * *'
+ - trigger:
+     name: 'compass-os-nosdn-bar-ha-virtual-master-trigger'
+     triggers:
+       - timed: '0 17 1-29/2 * *'
  
  # -------------------
  # noha-virtual-master
@@@ -823,6 -876,10 +846,10 @@@
      name: 'compass-k8-nosdn-nofeature-ha-virtual-euphrates-trigger'
      triggers:
        - timed: '5 1 2-30/2 * *'
+ - trigger:
+     name: 'compass-os-nosdn-bar-ha-virtual-euphrates-trigger'
+     triggers:
+       - timed: '0 19 1-29/2 * *'
  
  # -------------------
  # noha-virtual-euphrates