Merge "Apex: changing Gluon scenario name to noha"

diff --combined jjb/apex/apex.yml
index 5ec1c18,0b430d7..b9a387c
--- 1/jjb/apex/apex.yml
--- 2/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@@ -37,12 -37,11 +37,12 @@@
           - 'os-odl_l2-sfc-noha'
           - 'os-odl_l3-nofeature-ha'
           - 'os-odl-bgpvpn-ha'
-          - 'os-odl-gluon-ha'
+          - 'os-odl-gluon-noha'
           - 'os-odl_l3-fdio-noha'
           - 'os-odl_l3-fdio-ha'
           - 'os-odl_l3-fdio_dvr-noha'
           - 'os-odl_l3-fdio_dvr-ha'
 +         - 'os-odl_l3-csit-noha'
           - 'os-onos-nofeature-ha'
  
      platform:
@@@ -712,71 -711,6 +712,71 @@@
                  failure-threshold: 'never'
                  unstable-threshold: 'FAILURE'
  
 +# CSIT promote
 +- job-template:
 +    name: 'apex-csit-promote-daily-{stream}'
 +
 +    # Job template for promoting CSIT Snapshots
 +    #
 +    # Required Variables:
 +    #     stream:    branch with - in place of / (eg. stable)
 +    #     branch:    branch (eg. stable)
 +    node: '{daily-slave}'
 +
 +    disabled: false
 +
 +    scm:
 +        - git-scm:
 +            credentials-id: '{ssh-credentials}'
 +            refspec: ''
 +            branch: '{branch}'
 +
 +    parameters:
 +        - project-parameter:
 +            project: '{project}'
 +        - apex-parameter:
 +            gs-pathname: '{gs-pathname}'
 +
 +    properties:
 +        - build-blocker:
 +            use-build-blocker: true
 +            block-level: 'NODE'
 +            blocking-jobs:
 +                - 'apex-verify.*'
 +                - 'apex-deploy.*'
 +                - 'apex-build.*'
 +                - 'apex-runner.*'
 +
 +    triggers:
 +        - timed: '0 12 * * 0'
 +
 +    builders:
 +        - trigger-builds:
 +          - project: 'apex-build-{stream}'
 +            git-revision: true
 +            current-parameters: true
 +            same-node: true
 +            block: true
 +        - trigger-builds:
 +          - project: 'apex-deploy-virtual-os-odl_l3-csit-noha-{stream}'
 +            predefined-parameters: |
 +              BUILD_DIRECTORY=apex-build-{stream}/build
 +              OPNFV_CLEAN=yes
 +            git-revision: false
 +            block: true
 +            same-node: true
 +        - trigger-builds:
 +          - project: 'functest-apex-{verify-slave}-suite-{stream}'
 +            predefined-parameters: |
 +              DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
 +              FUNCTEST_SUITE_NAME=smoke
 +            block: true
 +            same-node: true
 +        - shell:
 +            !include-raw-escape: ./apex-snapshot-create.sh
 +        - shell:
 +            !include-raw-escape: ./apex-upload-artifact.sh
 +
  - job-template:
      name: 'apex-gs-clean-{stream}'