From: Tim Rozet <trozet@redhat.com>
Date: Mon, 8 Feb 2016 21:41:47 +0000 (+0000)
Subject: Merge "re-enabling ODL-L3 tests"
X-Git-Tag: brahmaputra.1.0~46
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=dc5bb9cb2a59aeeede763f988f1559ac4e2ba8c2;hp=c1a0205b89a43ee3d037375178dd04bedc7128ba;p=releng.git

Merge "re-enabling ODL-L3 tests"
---

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 5f8d067d0..1ab7f647f 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -384,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