openstack/ironic-inspector
Code Issues Proposed changes

Merge "zuul: Add ability to specify a 'branch_override' value"

Browse Source
This commit is contained in:
Zuul 2017-12-22 20:44:13 +00:00 committed by Gerrit Code Review
commit 6c8ab12e47
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml
View File

@ -139,12 +139,12 @@
export DEVSTACK_GATE_VIRT_DRIVER=ironic export DEVSTACK_GATE_VIRT_DRIVER=ironic
export DEVSTACK_GATE_CONFIGDRIVE=1 export DEVSTACK_GATE_CONFIGDRIVE=1
export DEVSTACK_GATE_IRONIC_DRIVER=pxe_ipmitool export DEVSTACK_GATE_IRONIC_DRIVER=pxe_ipmitool
export BRANCH_OVERRIDE=default export BRANCH_OVERRIDE="{{ branch_override | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi 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 export DEVSTACK_GATE_TLSPROXY=1
fi fi

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

@ -116,12 +116,12 @@
export DEVSTACK_GATE_VIRT_DRIVER=ironic export DEVSTACK_GATE_VIRT_DRIVER=ironic
export DEVSTACK_GATE_CONFIGDRIVE=1 export DEVSTACK_GATE_CONFIGDRIVE=1
export DEVSTACK_GATE_IRONIC_DRIVER=agent_ipmitool export DEVSTACK_GATE_IRONIC_DRIVER=agent_ipmitool
export BRANCH_OVERRIDE=default export BRANCH_OVERRIDE="{{ branch_override | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi 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 export DEVSTACK_GATE_TLSPROXY=1
fi fi

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

@ -98,7 +98,7 @@
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_VIRT_DRIVER=ironic export DEVSTACK_GATE_VIRT_DRIVER=ironic
export DEVSTACK_GATE_CONFIGDRIVE=1 export DEVSTACK_GATE_CONFIGDRIVE=1
export BRANCH_OVERRIDE=default export BRANCH_OVERRIDE="{{ branch_override | default('default') }}"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi fi