summaryrefslogtreecommitdiff
path: root/playbooks/legacy/tempest-dsvm-ironic-bfv
diff options
context:
space:
mode:
authorJohn L. Villalovos <john.l.villalovos@intel.com>2017-12-22 09:05:49 -0800
committerJohn L. Villalovos <john.l.villalovos@intel.com>2017-12-22 09:06:59 -0800
commit844cd0436acfb63a9806fbe885146c713338c55a (patch)
treea36c32166c227a08666ed648d75279079e18831e /playbooks/legacy/tempest-dsvm-ironic-bfv
parent8490f7560789fa316741f30ac2dfcc9bc6086af4 (diff)
downloadironic-844cd0436acfb63a9806fbe885146c713338c55a.tar.gz
zuul: Update TLSPROXY based on branch
We can not use DEVSTACK_GATE_TLSPROXY=1 when building stable/ocata. Update it to not set it if we have BRANCH_OVERRIDE or the ZUUL_BRANCH set to stable/ocata. This will allow us to build stable/ocata from the openstack/ironic-tempest-plugin gate jobs. Change-Id: Id487b997a9d83c5daf2f9284a4e80e1f90fe6ce2
Diffstat (limited to 'playbooks/legacy/tempest-dsvm-ironic-bfv')
-rw-r--r--playbooks/legacy/tempest-dsvm-ironic-bfv/run.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/legacy/tempest-dsvm-ironic-bfv/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-bfv/run.yaml
index f2ac2b9b2..cf89e5c6f 100644
--- a/playbooks/legacy/tempest-dsvm-ironic-bfv/run.yaml
+++ b/playbooks/legacy/tempest-dsvm-ironic-bfv/run.yaml
@@ -105,7 +105,7 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
- if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
+ if [[ "$ZUUL_BRANCH" != "stable/ocata" && "$BRANCH_OVERRIDE" != "stable/ocata" ]]; then
export DEVSTACK_GATE_TLSPROXY=1
fi