Merge "armband: Re-enable baremetal scenario triggers"

diff --combined jjb/armband/armband-ci-jobs.yml
index c0ef21c,ded70b1..faa5971
--- 1/jjb/armband/armband-ci-jobs.yml
--- 2/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@@ -50,7 -50,7 +50,7 @@@
          # HA scenarios
          - 'os-nosdn-nofeature-ha':
              auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
 -        - 'os-odl_l3-nofeature-ha':
 +        - 'os-odl-nofeature-ha':
              auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
  
          # NOHA scenarios
@@@ -82,7 -82,6 +82,7 @@@
              use-build-blocker: true
              blocking-jobs:
                  - '{installer}-os-.*?-{pod}-daily-.*'
 +                - 'armband-verify-.*'
              block-level: 'NODE'
  
      wrappers:
@@@ -96,13 -95,14 +96,13 @@@
          - project-parameter:
              project: '{project}'
              branch: '{branch}'
 -        - '{installer}-defaults'
 +        - '{installer}-defaults':
 +            gs-pathname: '{gs-pathname}'
          - '{slave-label}-defaults':
              installer: '{installer}'
          - string:
              name: DEPLOY_SCENARIO
              default: '{scenario}'
 -        - armband-ci-parameter:
 -            gs-pathname: '{gs-pathname}'
  
      builders:
          - trigger-builds:
@@@ -139,10 -139,10 +139,10 @@@
          # 3.only proposed_tests testsuite here(refstack, ha, ipv6, bgpvpn)
          # 4.not used for release criteria or compliance,
          #   only to debug the dovetail tool bugs with arm pods
 -        # 5.only run against scenario os-(nosdn|odl_l3)-(nofeature-bgpvpn)-ha
 +        # 5.only run against scenario os-(nosdn|odl)-(nofeature-bgpvpn)-ha
          - conditional-step:
              condition-kind: regex-match
 -            regex: os-(nosdn|odl|odl_l3)-(nofeature|bgpvpn)-ha
 +            regex: os-(nosdn|odl)-(nofeature|bgpvpn)-ha
              label: '{scenario}'
              steps:
                  - trigger-builds:
@@@ -180,13 -180,14 +180,13 @@@
          - project-parameter:
              project: '{project}'
              branch: '{branch}'
 -        - '{installer}-defaults'
 +        - '{installer}-defaults':
 +            gs-pathname: '{gs-pathname}'
          - '{slave-label}-defaults':
              installer: '{installer}'
          - string:
              name: DEPLOY_SCENARIO
 -            default: 'os-odl_l3-nofeature-ha'
 -        - armband-ci-parameter:
 -            gs-pathname: '{gs-pathname}'
 +            default: 'os-odl-nofeature-ha'
  
      scm:
          - git-scm
@@@ -204,6 -205,21 +204,6 @@@
              recipients: armband@enea.com
          - email-jenkins-admins-on-failure
  
 -########################
 -# parameter macros
 -########################
 -- parameter:
 -    name: armband-ci-parameter
 -    parameters:
 -        - string:
 -            name: GS_URL
 -            default: artifacts.opnfv.org/$PROJECT{gs-pathname}
 -            description: "URL to Google Storage."
 -        - string:
 -            name: SSH_KEY
 -            default: "/tmp/mcp.rsa"
 -            description: "Path to private SSH key to access environment nodes. For MCP deployments only."
 -
  ########################
  # trigger macros
  ########################
@@@ -214,15 -230,15 +214,15 @@@
  - trigger:
      name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger'
      triggers:
-         - timed: ''
+         - timed: '0 1 * * *'
  - trigger:
      name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-master-trigger'
      triggers:
          - timed: ''
  - trigger:
 -    name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-master-trigger'
 +    name: 'fuel-os-odl-nofeature-ha-armband-baremetal-master-trigger'
      triggers:
-         - timed: ''
+         - timed: '0 16 * * *'
  #----------------------------------------------------------------------
  # Enea Armband CI Baremetal Triggers running against euphrates branch
  #----------------------------------------------------------------------
@@@ -235,7 -251,7 +235,7 @@@
      triggers:
          - timed: ''
  - trigger:
 -    name: 'fuel-os-odl_l3-nofeature-ha-armband-baremetal-euphrates-trigger'
 +    name: 'fuel-os-odl-nofeature-ha-armband-baremetal-euphrates-trigger'
      triggers:
          - timed: ''
  #---------------------------------------------------------------
@@@ -250,7 -266,7 +250,7 @@@
      triggers:
          - timed: ''
  - trigger:
 -    name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-master-trigger'
 +    name: 'fuel-os-odl-nofeature-ha-armband-virtual-master-trigger'
      triggers:
          - timed: ''
  #--------------------------------------------------------------------
@@@ -265,6 -281,6 +265,6 @@@
      triggers:
          - timed: ''
  - trigger:
 -    name: 'fuel-os-odl_l3-nofeature-ha-armband-virtual-euphrates-trigger'
 +    name: 'fuel-os-odl-nofeature-ha-armband-virtual-euphrates-trigger'
      triggers:
          - timed: ''