openstack/ironic
Code Issues Proposed changes

Change integration jobs to run under Python3

Browse Source 
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:
Iury Gregory Melo Ferreira 2019-10-09 11:46:58 +02:00
parent 5ed3f86c3f
commit bba990c7e0
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zuul.d/ironic-jobs.yaml
View File

@ -54,6 +54,8 @@
Q_AGENT: openvswitch
Q_ML2_TENANT_NETWORK_TYPE: vxlan
USE_PYTHON3: True
devstack_plugins:
ironic: https://opendev.org/openstack/ironic
zuul_copy_output:
@ -196,13 +198,10 @@
IRONIC_AUTOMATED_CLEAN_ENABLED: False
- job:
name: ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3
description: ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3
name: ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa
description: ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa
parent: ironic-base
timeout: 5400
vars:
devstack_localrc:
USE_PYTHON3: True
- job:
name: ironic-tempest-bfv
@ -276,8 +275,8 @@
IRONIC_AUTOMATED_CLEAN_ENABLED: False
- job:
name: ironic-tempest-functional-python2
description: ironic-tempest-functional-python2
name: ironic-tempest-functional-python3
description: ironic-tempest-functional-python3
parent: ironic-base
timeout: 5400
pre-run: playbooks/ci-workarounds/etc-neutron.yaml
@ -318,12 +317,12 @@
neutron-metering: False
- job:
name: ironic-tempest-functional-python3
description: ironic-tempest-functional-python3
parent: ironic-tempest-functional-python2
name: ironic-tempest-functional-python2
description: ironic-tempest-functional-python2
parent: ironic-tempest-functional-python3
vars:
devstack_localrc:
USE_PYTHON3: True
USE_PYTHON3: False
- job:
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
# ephemeral partition on such nodes
LIBVIRT_STORAGE_POOL_PATH: /opt/libvirt/images
USE_PYTHON3: True
devstack_plugins:
ironic: https://opendev.org/openstack/ironic
networking-generic-switch: https://opendev.org/openstack/networking-generic-switch
@ -471,6 +472,7 @@
Q_ML2_TENANT_NETWORK_TYPE: vlan
VIRT_DRIVER: ironic
PUBLIC_BRIDGE: br-infra
USE_PYTHON3: True
devstack_services:
c-api: False
c-bak: False

4
zuul.d/project.yaml
View File

@ -19,7 +19,7 @@
# Temporary disable voting because of end of cycle CI instability.
- ironic-grenade-dsvm-multinode-multitenant:
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-uefi-pxe_ipmitool-tinyipa
- ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode:
@ -55,7 +55,7 @@
- ironic-grenade-dsvm
# removing from voting due to end of cycle gate instability.
# - 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-uefi-pxe_ipmitool-tinyipa
# removing from voting due to end of cycle gate instability.