From 844cd0436acfb63a9806fbe885146c713338c55a Mon Sep 17 00:00:00 2001 From: "John L. Villalovos" Date: Fri, 22 Dec 2017 09:05:49 -0800 Subject: 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 --- playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml') 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 -- cgit v1.2.1