From 14e798cd6c728782a591a5a9d6721dd60315e2e4 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Fri, 22 Dec 2017 17:30:21 +0100 Subject: [PATCH] zuul: Add ability to specify a 'branch_override' value To be able to run a job on a different branch add the ability to specify a 'branch_override' value. We will use this in the openstack/ironic-tempest-plugin testing to be able to check changes against our stable branches. Change-Id: I4ba2a44bf9b03d85e339bc5761770e8943dd2140 --- playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml | 4 ++-- .../legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml | 4 ++-- .../legacy/ironic-inspector-tempest-dsvm-python3/run.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml b/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml index fa6d41a43..36a24ff74 100644 --- a/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml +++ b/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml @@ -139,12 +139,12 @@ export DEVSTACK_GATE_VIRT_DRIVER=ironic export DEVSTACK_GATE_CONFIGDRIVE=1 export DEVSTACK_GATE_IRONIC_DRIVER=pxe_ipmitool - export BRANCH_OVERRIDE=default + export BRANCH_OVERRIDE="{{ branch_override | default('default') }}" if [ "$BRANCH_OVERRIDE" != "default" ] ; then 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 diff --git a/playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml b/playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml index 17eb87f07..bacf27c56 100644 --- a/playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml +++ b/playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml @@ -116,12 +116,12 @@ export DEVSTACK_GATE_VIRT_DRIVER=ironic export DEVSTACK_GATE_CONFIGDRIVE=1 export DEVSTACK_GATE_IRONIC_DRIVER=agent_ipmitool - export BRANCH_OVERRIDE=default + export BRANCH_OVERRIDE="{{ branch_override | default('default') }}" if [ "$BRANCH_OVERRIDE" != "default" ] ; then 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 diff --git a/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml b/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml index 37ab266c5..6c64fc0d0 100644 --- a/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml +++ b/playbooks/legacy/ironic-inspector-tempest-dsvm-python3/run.yaml @@ -98,7 +98,7 @@ export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_VIRT_DRIVER=ironic export DEVSTACK_GATE_CONFIGDRIVE=1 - export BRANCH_OVERRIDE=default + export BRANCH_OVERRIDE="{{ branch_override | default('default') }}" if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi