diff options
| author | Zuul <zuul@review.openstack.org> | 2018-02-07 19:34:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-02-07 19:34:29 +0000 |
| commit | bde3d3fb8692c2d4aa4e920b20dd19e05f8ce930 (patch) | |
| tree | e9a0618f9d6635c8eaad6171be8c134ebd0f2d8e | |
| parent | 87a298ff706bd81dfa37de789da8ecfaef3c569e (diff) | |
| parent | 59942423518ac658e1fcaa1346b8aa1384a23114 (diff) | |
| download | ironic-7.0.4.tar.gz | |
Merge "Use zuul.override_checkout instead of custom branch_override var" into stable/ocata7.0.4
10 files changed, 30 insertions, 40 deletions
diff --git a/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml index 6e50beb34..03c27a643 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-inspector/run.yaml @@ -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 diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-agent_ipmitool-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-agent_ipmitool-tinyipa/run.yaml index e2de3877b..7da951267 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-agent_ipmitool-tinyipa/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-agent_ipmitool-tinyipa/run.yaml @@ -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 diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-pxe_ipmitool-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-pxe_ipmitool-tinyipa/run.yaml index d6f575732..627cfc643 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-pxe_ipmitool-tinyipa/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-bios-pxe_ipmitool-tinyipa/run.yaml @@ -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 diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-uefi-pxe_ipmitool-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-uefi-pxe_ipmitool-tinyipa/run.yaml index cdae7da4c..aad7a672e 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-uefi-pxe_ipmitool-tinyipa/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-uefi-pxe_ipmitool-tinyipa/run.yaml @@ -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 diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml index 2aaaf30e3..b993c77fb 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-agent_ipmitool-tinyipa-multinode/run.yaml @@ -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 diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa/run.yaml index b12bc9bc9..4c029ce66 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-agent_ipmitool-tinyipa/run.yaml @@ -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 diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_ipmitool-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_ipmitool-tinyipa/run.yaml index 19327b241..4d88b7608 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_ipmitool-tinyipa/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_ipmitool-tinyipa/run.yaml @@ -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 diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_snmp-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_snmp-tinyipa/run.yaml index 828b37cdf..8f663e619 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_snmp-tinyipa/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-ipa-wholedisk-bios-pxe_snmp-tinyipa/run.yaml @@ -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 diff --git a/playbooks/legacy/tempest-dsvm-ironic-multitenant-network/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-multitenant-network/run.yaml index 9cd459b80..f75c8a821 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-multitenant-network/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-multitenant-network/run.yaml @@ -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 diff --git a/playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml index 4d67c8cc9..846172006 100644 --- a/playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml +++ b/playbooks/legacy/tempest-dsvm-ironic-pxe_ipmitool-postgres/run.yaml @@ -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 |