openstack/ironic
Code Issues Proposed changes

Merge "Change integration jobs to run under Python3"

Browse Source
This commit is contained in:
Zuul 2019-10-26 08:07:42 +00:00 committed by Gerrit Code Review
commit 630c85126b
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

@ -52,6 +52,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:
@ -198,13 +200,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
@ -278,8 +277,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
@ -320,12 +319,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
@ -408,6 +407,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
@ -473,6 +474,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

4
zuul.d/project.yaml
View File

@ -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.