diff options
| author | John L. Villalovos <john.l.villalovos@intel.com> | 2017-12-22 09:05:49 -0800 |
|---|---|---|
| committer | John L. Villalovos <john.l.villalovos@intel.com> | 2017-12-22 09:06:59 -0800 |
| commit | 844cd0436acfb63a9806fbe885146c713338c55a (patch) | |
| tree | a36c32166c227a08666ed648d75279079e18831e /playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml | |
| parent | 8490f7560789fa316741f30ac2dfcc9bc6086af4 (diff) | |
| download | ironic-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/grenade-dsvm-ironic-multinode-multitenant/run.yaml')
| -rw-r--r-- | playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml index 82d759ef8..775f684ba 100644 --- a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml @@ -152,7 +152,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 |