openstack
/
ironic
Code Issues Proposed changes

Use zuul.override_checkout instead of custom branch_override var 

To override the branch correctly in both zuulv3's playbook loading we
have to use override_checkout in the job. This variable already gives us
the information we need to set the override branch, so use that instead
of the custom branch_override variable so we don't have to define it
twice in the job.

Change-Id: Iec7be918f75e3400197748385b287fb945d761ac
(cherry picked from commit dcc5546b49)
This commit is contained in:
Sam Betts 2018-02-02 16:07:55 +00:00
parent 0772e59727
commit 5994242351
10 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml
View File

@ -119,14 +119,13 @@
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="{{ zuul.override_checkout | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
export DEVSTACK_GATE_TLSPROXY=1
fi
# We do not support TLS proxy on Ocata
export DEVSTACK_GATE_TLSPROXY=0
if [ "agent_ipmitool" == "pxe_snmp" ] ; then
# explicitly enable pxe_snmp driver

7
playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-agent_ipmitool-tinyipa/run.yaml
View File

@ -87,14 +87,13 @@
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="{{ zuul.override_checkout | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
export DEVSTACK_GATE_TLSPROXY=1
fi
# We do not support TLS proxy on Ocata
export DEVSTACK_GATE_TLSPROXY=0
if [ "agent_ipmitool" == "pxe_snmp" ] ; then
# explicitly enable pxe_snmp driver

7
playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-pxe_ipmitool-tinyipa/run.yaml
View File

@ -87,14 +87,13 @@
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="{{ zuul.override_checkout | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
export DEVSTACK_GATE_TLSPROXY=1
fi
# We do not support TLS proxy on Ocata
export DEVSTACK_GATE_TLSPROXY=0
if [ "pxe_ipmitool" == "pxe_snmp" ] ; then
# explicitly enable pxe_snmp driver

7
playbooks/legacy/tempest-dsvm-ironic-ipa-partition-uefi-pxe_ipmitool-tinyipa/run.yaml
View File

@ -87,14 +87,13 @@
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="{{ zuul.override_checkout | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
export DEVSTACK_GATE_TLSPROXY=1
fi
# We do not support TLS proxy on Ocata
export DEVSTACK_GATE_TLSPROXY=0
if [ "pxe_ipmitool" == "pxe_snmp" ] ; then
# explicitly enable pxe_snmp driver

7
playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml
View File

@ -113,14 +113,13 @@
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="{{ zuul.override_checkout | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
export DEVSTACK_GATE_TLSPROXY=1
fi
# We do not support TLS proxy on Ocata
export DEVSTACK_GATE_TLSPROXY=0
if [ "agent_ipmitool" == "pxe_snmp" ] ; then
# explicitly enable pxe_snmp driver

7
playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa/run.yaml
View File

@ -87,14 +87,13 @@
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="{{ zuul.override_checkout | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
export DEVSTACK_GATE_TLSPROXY=1
fi
# We do not support TLS proxy on Ocata
export DEVSTACK_GATE_TLSPROXY=0
if [ "agent_ipmitool" == "pxe_snmp" ] ; then
# explicitly enable pxe_snmp driver

7
playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_ipmitool-tinyipa/run.yaml
View File

@ -87,14 +87,13 @@
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="{{ zuul.override_checkout | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
export DEVSTACK_GATE_TLSPROXY=1
fi
# We do not support TLS proxy on Ocata
export DEVSTACK_GATE_TLSPROXY=0
if [ "pxe_ipmitool" == "pxe_snmp" ] ; then
# explicitly enable pxe_snmp driver

7
playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_snmp-tinyipa/run.yaml
View File

@ -87,14 +87,13 @@
export DEVSTACK_GATE_VIRT_DRIVER=ironic
export DEVSTACK_GATE_CONFIGDRIVE=1
export DEVSTACK_GATE_IRONIC_DRIVER=pxe_snmp
export BRANCH_OVERRIDE=default
export BRANCH_OVERRIDE="{{ zuul.override_checkout | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
export DEVSTACK_GATE_TLSPROXY=1
fi
# We do not support TLS proxy on Ocata
export DEVSTACK_GATE_TLSPROXY=0
if [ "pxe_snmp" == "pxe_snmp" ] ; then
# explicitly enable pxe_snmp driver

7
playbooks/legacy/tempest-dsvm-ironic-multitenant-network/run.yaml
View File

@ -113,14 +113,13 @@
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="{{ zuul.override_checkout | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
export DEVSTACK_GATE_TLSPROXY=1
fi
# We do not support TLS proxy on Ocata
export DEVSTACK_GATE_TLSPROXY=0
if [ "agent_ipmitool" == "pxe_snmp" ] ; then
# explicitly enable pxe_snmp driver

7
playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml
View File

@ -105,14 +105,13 @@
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="{{ zuul.override_checkout | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
export DEVSTACK_GATE_TLSPROXY=1
fi
# We do not support TLS proxy on Ocata
export DEVSTACK_GATE_TLSPROXY=0
if [ "pxe_ipmitool" == "pxe_snmp" ] ; then
# explicitly enable pxe_snmp driver