From bba990c7e07873ab32c2f0b3f536997bd70559d6 Mon Sep 17 00:00:00 2001
From: Iury Gregory Melo Ferreira <imelofer@redhat.com>
Date: Wed, 9 Oct 2019 11:46:58 +0200
Subject: [PATCH] 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
---
 zuul.d/ironic-jobs.yaml | 24 +++++++++++++-----------
 zuul.d/project.yaml     |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 32cf9e649a..333871248f 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -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
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 3819f86890..8188ec1dbf 100644
--- a/zuul.d/project.yaml
+++ b/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.