Change integration jobs to run under Python3
This patch enables python3 by default in the `ironic-base` job. All jobs that have `ironic-base` as `parent` will be running under python3 by default. - Switch parent/child for `ironic-tempest-functional-python2` and `ironic-tempest-functional-python3` - Renamed `ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3` to `ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa` since it was running under python3 that it's the default now Depends-On: https://review.opendev.org/690537 Change-Id: Ibc503baa572c2746e1e703653ddf040bad5e8363
This commit is contained in:
parent
5ed3f86c3f
commit
bba990c7e0
@ -54,6 +54,8 @@
|
|||||||
|
|
||||||
Q_AGENT: openvswitch
|
Q_AGENT: openvswitch
|
||||||
Q_ML2_TENANT_NETWORK_TYPE: vxlan
|
Q_ML2_TENANT_NETWORK_TYPE: vxlan
|
||||||
|
|
||||||
|
USE_PYTHON3: True
|
||||||
devstack_plugins:
|
devstack_plugins:
|
||||||
ironic: https://opendev.org/openstack/ironic
|
ironic: https://opendev.org/openstack/ironic
|
||||||
zuul_copy_output:
|
zuul_copy_output:
|
||||||
@ -196,13 +198,10 @@
|
|||||||
IRONIC_AUTOMATED_CLEAN_ENABLED: False
|
IRONIC_AUTOMATED_CLEAN_ENABLED: False
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3
|
name: ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa
|
||||||
description: ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3
|
description: ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa
|
||||||
parent: ironic-base
|
parent: ironic-base
|
||||||
timeout: 5400
|
timeout: 5400
|
||||||
vars:
|
|
||||||
devstack_localrc:
|
|
||||||
USE_PYTHON3: True
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: ironic-tempest-bfv
|
name: ironic-tempest-bfv
|
||||||
@ -276,8 +275,8 @@
|
|||||||
IRONIC_AUTOMATED_CLEAN_ENABLED: False
|
IRONIC_AUTOMATED_CLEAN_ENABLED: False
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: ironic-tempest-functional-python2
|
name: ironic-tempest-functional-python3
|
||||||
description: ironic-tempest-functional-python2
|
description: ironic-tempest-functional-python3
|
||||||
parent: ironic-base
|
parent: ironic-base
|
||||||
timeout: 5400
|
timeout: 5400
|
||||||
pre-run: playbooks/ci-workarounds/etc-neutron.yaml
|
pre-run: playbooks/ci-workarounds/etc-neutron.yaml
|
||||||
@ -318,12 +317,12 @@
|
|||||||
neutron-metering: False
|
neutron-metering: False
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: ironic-tempest-functional-python3
|
name: ironic-tempest-functional-python2
|
||||||
description: ironic-tempest-functional-python3
|
description: ironic-tempest-functional-python2
|
||||||
parent: ironic-tempest-functional-python2
|
parent: ironic-tempest-functional-python3
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
USE_PYTHON3: True
|
USE_PYTHON3: False
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
|
name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
|
||||||
@ -406,6 +405,8 @@
|
|||||||
# a small root partition, so use /opt which is mounted from a bigger
|
# a small root partition, so use /opt which is mounted from a bigger
|
||||||
# ephemeral partition on such nodes
|
# ephemeral partition on such nodes
|
||||||
LIBVIRT_STORAGE_POOL_PATH: /opt/libvirt/images
|
LIBVIRT_STORAGE_POOL_PATH: /opt/libvirt/images
|
||||||
|
|
||||||
|
USE_PYTHON3: True
|
||||||
devstack_plugins:
|
devstack_plugins:
|
||||||
ironic: https://opendev.org/openstack/ironic
|
ironic: https://opendev.org/openstack/ironic
|
||||||
networking-generic-switch: https://opendev.org/openstack/networking-generic-switch
|
networking-generic-switch: https://opendev.org/openstack/networking-generic-switch
|
||||||
@ -471,6 +472,7 @@
|
|||||||
Q_ML2_TENANT_NETWORK_TYPE: vlan
|
Q_ML2_TENANT_NETWORK_TYPE: vlan
|
||||||
VIRT_DRIVER: ironic
|
VIRT_DRIVER: ironic
|
||||||
PUBLIC_BRIDGE: br-infra
|
PUBLIC_BRIDGE: br-infra
|
||||||
|
USE_PYTHON3: True
|
||||||
devstack_services:
|
devstack_services:
|
||||||
c-api: False
|
c-api: False
|
||||||
c-bak: False
|
c-bak: False
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
# Temporary disable voting because of end of cycle CI instability.
|
# Temporary disable voting because of end of cycle CI instability.
|
||||||
- ironic-grenade-dsvm-multinode-multitenant:
|
- ironic-grenade-dsvm-multinode-multitenant:
|
||||||
voting: false
|
voting: false
|
||||||
- ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3
|
- ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa
|
||||||
- ironic-tempest-ipa-partition-redfish-tinyipa
|
- ironic-tempest-ipa-partition-redfish-tinyipa
|
||||||
- ironic-tempest-ipa-partition-uefi-pxe_ipmitool-tinyipa
|
- ironic-tempest-ipa-partition-uefi-pxe_ipmitool-tinyipa
|
||||||
- ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode:
|
- ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode:
|
||||||
@ -55,7 +55,7 @@
|
|||||||
- ironic-grenade-dsvm
|
- ironic-grenade-dsvm
|
||||||
# removing from voting due to end of cycle gate instability.
|
# removing from voting due to end of cycle gate instability.
|
||||||
# - ironic-grenade-dsvm-multinode-multitenant
|
# - ironic-grenade-dsvm-multinode-multitenant
|
||||||
- ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3
|
- ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa
|
||||||
- ironic-tempest-ipa-partition-redfish-tinyipa
|
- ironic-tempest-ipa-partition-redfish-tinyipa
|
||||||
- ironic-tempest-ipa-partition-uefi-pxe_ipmitool-tinyipa
|
- ironic-tempest-ipa-partition-uefi-pxe_ipmitool-tinyipa
|
||||||
# removing from voting due to end of cycle gate instability.
|
# removing from voting due to end of cycle gate instability.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user