Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Use local repository for docker build"
[releng.git]
/
jjb
/
apex
/
apex.yml.j2
diff --git
a/jjb/apex/apex.yml.j2
b/jjb/apex/apex.yml.j2
index
6cd9de2
..
27a854d
100644
(file)
--- a/
jjb/apex/apex.yml.j2
+++ b/
jjb/apex/apex.yml.j2
@@
-35,7
+35,7
@@
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
scenario_stream: 'euphrates'
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
scenario_stream: 'euphrates'
- disable_daily:
fals
e
+ disable_daily:
tru
e
- danube: &danube
branch: 'stable/danube'
gs-pathname: '/danube'
- danube: &danube
branch: 'stable/danube'
gs-pathname: '/danube'
@@
-419,7
+419,7
@@
predefined-parameters:
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
kill-phase-on: NEVER
predefined-parameters:
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
kill-phase-on: NEVER
- enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|
nosdn-kvm|odl_l3-fdio
)-ha/"
+ enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|
odl-bgpvpn
)-ha/"
abort-all-job: false
git-revision: false
- multijob:
abort-all-job: false
git-revision: false
- multijob: