Merge "Apex: disables failing parent daily job due to a deploy job failing"

diff --combined jjb/apex/apex.yml
index edc669e,73b379f..8f9f49e
--- 1/jjb/apex/apex.yml
--- 2/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@@ -323,58 -323,6 +323,58 @@@
                  failure-threshold: 'never'
                  unstable-threshold: 'FAILURE'
  
 +- job-template:
 +    name: 'apex-runner-cperf-{stream1}'
 +
 +    # runner cperf job
 +
 +    node: 'intel-pod2'
 +
 +    disabled: false
 +
 +    parameters:
 +        - apex-parameter:
 +            gs-pathname: '{gs-pathname}'
 +        - project-parameter:
 +            project: '{project}'
 +        - gerrit-parameter:
 +            branch: '{branch}'
 +        - string:
 +            name: GIT_BASE
 +            default: https://gerrit.opnfv.org/gerrit/$PROJECT
 +            description: "Used for overriding the GIT URL coming from parameters macro."
 +
 +    scm:
 +        - gerrit-trigger-scm:
 +            credentials-id: '{ssh-credentials}'
 +            refspec: ''
 +            choosing-strategy: 'default'
 +
 +    properties:
 +        - build-blocker:
 +            use-build-blocker: false
 +            block-level: 'NODE'
 +            blocking-jobs:
 +                - 'apex-deploy.*{stream}'
 +        - throttle:
 +            max-per-node: 1
 +            max-total: 10
 +            option: 'project'
 +
 +    builders:
 +        - trigger-builds:
 +          - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream1}'
 +            predefined-parameters:
 +              OPNFV_CLEAN=yes
 +            git-revision: false
 +            block: true
 +        - trigger-builds:
 +          - project: 'cperf-apex-intel-pod2-daily-{stream1}'
 +            predefined-parameters:
 +              DEPLOY_SCENARIO=os-odl_l2-nofeature-ha
 +            block: true
 +            same-node: true
 +
  - job-template:
      name: 'apex-build-{stream}'
  
@@@ -714,6 -662,8 +714,8 @@@
                OPNFV_CLEAN=yes
              git-revision: true
              same-node: true
+             block-thresholds:
+                 build-step-failure-threshold: 'never'
              block: true
          - trigger-builds:
            - project: 'functest-apex-{daily-slave}-daily-{stream1}'
@@@ -742,6 -692,8 +744,8 @@@
                OPNFV_CLEAN=yes
              git-revision: true
              same-node: true
+             block-thresholds:
+                 build-step-failure-threshold: 'never'
              block: true
          - trigger-builds:
            - project: 'functest-apex-{daily-slave}-daily-{stream1}'
@@@ -770,6 -722,8 +774,8 @@@
                OPNFV_CLEAN=yes
              git-revision: true
              same-node: true
+             block-thresholds:
+                 build-step-failure-threshold: 'never'
              block: true
          - trigger-builds:
            - project: 'functest-apex-{daily-slave}-daily-{stream1}'
@@@ -798,6 -752,8 +804,8 @@@
                OPNFV_CLEAN=yes
              git-revision: true
              same-node: true
+             block-thresholds:
+                 build-step-failure-threshold: 'never'
              block: true
          - trigger-builds:
            - project: 'functest-apex-{daily-slave}-daily-{stream1}'