Merge "Change integration jobs to run under Python3"

zuul.d/ironic-jobs.yaml

@@ -52,6 +52,8 @@
 
         Q_AGENT: openvswitch
         Q_ML2_TENANT_NETWORK_TYPE: vxlan
+
+        USE_PYTHON3: True
       devstack_plugins:
         ironic: https://opendev.org/openstack/ironic
       zuul_copy_output:
@@ -198,13 +200,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
@@ -278,8 +277,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
@@ -320,12 +319,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
@@ -408,6 +407,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
@@ -473,6 +474,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

zuul.d/project.yaml

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