Merge "re-enabling ODL-L3 tests"

diff --combined jjb/apex/apex.yml
index 5f8d067,785056f..1ab7f64
--- 1/jjb/apex/apex.yml
--- 2/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@@ -84,6 -84,9 +84,6 @@@
                      pattern: 'lib/**'
                    - compare-type: ANT
                      pattern: 'config/**'
 -                forbidden-file-paths:
 -                  - compare-type: ANT
 -                    pattern: 'docs/**'
  
      properties:
          - build-blocker:
@@@ -157,16 -160,16 +157,16 @@@
              git-revision: false
              block: true
          - trigger-builds:
 -          - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
 -            predefined-parameters:
 -              DEPLOY_SCENARIO={scenario}
 +          - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
              block: true
              block-thresholds:
                  build-step-failure-threshold: 'never'
                  failure-threshold: 'never'
                  unstable-threshold: 'FAILURE'
          - trigger-builds:
 -          - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
 +          - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
 +            predefined-parameters:
 +              DEPLOY_SCENARIO={scenario}
              block: true
              block-thresholds:
                  build-step-failure-threshold: 'never'
@@@ -384,28 -387,28 +384,28 @@@
                  build-step-failure-threshold: 'never'
                  failure-threshold: 'never'
                  unstable-threshold: 'FAILURE'
- #        - trigger-builds:
- #          - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
- #            predefined-parameters:
- #              BUILD_DIRECTORY=apex-build-master/build_output
- #            git-revision: true
- #            block: true
- #        - trigger-builds:
- #          - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
- #            predefined-parameters:
- #              DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
- #            block: true
- #            block-thresholds:
- #                build-step-failure-threshold: 'never'
- #                failure-threshold: 'never'
- #                unstable-threshold: 'FAILURE'
- #        - trigger-builds:
- #          - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
- #            block: true
- #            block-thresholds:
- #                build-step-failure-threshold: 'never'
- #                failure-threshold: 'never'
- #                unstable-threshold: 'FAILURE'
+         - trigger-builds:
+           - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
+             predefined-parameters:
+               BUILD_DIRECTORY=apex-build-{stream}/build_output
+             git-revision: true
+             block: true
+         - trigger-builds:
+           - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+             predefined-parameters:
+               DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
+             block: true
+             block-thresholds:
+                 build-step-failure-threshold: 'never'
+                 failure-threshold: 'never'
+                 unstable-threshold: 'FAILURE'
+         - trigger-builds:
+           - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
+             block: true
+             block-thresholds:
+                 build-step-failure-threshold: 'never'
+                 failure-threshold: 'never'
+                 unstable-threshold: 'FAILURE'
  
  ########################
  # parameter macros