summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-01-15 14:37:17 +0000
committerGerrit Code Review <review@openstack.org>2020-01-15 14:37:17 +0000
commit5b24267c599ad248dfbd381a20452ed6e2dbcd90 (patch)
tree5b8cdacf46b30cc91c2da8f2e6de1162c576f036
parent7596a9a055de4e0c1a65c64d163fca58b6a3847f (diff)
parent3084e23b4640e171138775591ead156b64b1bf59 (diff)
downloadheat-5b24267c599ad248dfbd381a20452ed6e2dbcd90.tar.gz
Merge "Correct BRANCH_OVERRIDE for stable/train" into stable/train
-rw-r--r--playbooks/devstack/functional/run.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/playbooks/devstack/functional/run.yaml b/playbooks/devstack/functional/run.yaml
index 80648ddab..7026c6947 100644
--- a/playbooks/devstack/functional/run.yaml
+++ b/playbooks/devstack/functional/run.yaml
@@ -84,6 +84,7 @@
export OVERRIDE_ENABLED_SERVICES=$services
+ export BRANCH_OVERRIDE="{{ branch_override | default('default') }}"
if [ "{{ branch_override }}" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi