summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-02-08 21:41:47 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-02-08 21:41:47 +0000
commitdc5bb9cb2a59aeeede763f988f1559ac4e2ba8c2 (patch)
tree3becea7258d1f80b6b4d40f7118c1d7048675ebf
parentc1a0205b89a43ee3d037375178dd04bedc7128ba (diff)
parentb683299a774daf8fcee8fa881602316a40921464 (diff)
Merge "re-enabling ODL-L3 tests"
-rw-r--r--jjb/apex/apex.yml44
1 files changed, 22 insertions, 22 deletions
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