From 6e642f42419437f43a9db5c471448c7316fc84f9 Mon Sep 17 00:00:00 2001
From: Cyril Roelandt <cyril@redhat.com>
Date: Fri, 27 Jun 2025 03:02:19 +0200
Subject: [PATCH] Zuul: do not use USE_PYTHON3

Devstack has removed the USE_PYTHON3 variable[1][2] and now always uses
Python 3.

[1] https://review.opendev.org/c/openstack/devstack/+/920658
[2] Commit 5412dbfe7b797149f1f68100de8003b1876398fe

Change-Id: I7aaa9bc7865fbaf4be9cee1a2fb5aac9e0036ecd
---
 .zuul.yaml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index efd1074a2..eb928c23e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -23,7 +23,6 @@
         KURYR_CONFIG_DIR: /etc/kuryr-libnetwork
         ZUN_DRIVER: docker
         ZUN_DB_TYPE: sql
-        USE_PYTHON3: true
         ENABLE_CONTAINERD_CRI: true
       devstack_local_conf:
         test-config:
@@ -59,21 +58,17 @@
     vars:
       devstack_localrc:
         KURYR_PROCESS_EXTERNAL_CONNECTIVITY: false
-        USE_PYTHON3: true
     group-vars:
       subnode:
         devstack_localrc:
           KURYR_PROCESS_EXTERNAL_CONNECTIVITY: false
           KURYR_CONFIG_DIR: /etc/kuryr-libnetwork
-          USE_PYTHON3: true
           ENABLE_CONTAINERD_CRI: true
 
 - job:
     name: zun-tempest-py3-docker-sql
     parent: zun-tempest-base
     vars:
-      devstack_localrc:
-        USE_PYTHON3: true
       devstack_services:
         s-account: false
         s-object: false
@@ -113,8 +108,6 @@
     name: zun-tempest-docker-sql-standalone
     parent: zun-tempest-base
     vars:
-      devstack_localrc:
-        USE_PYTHON3: true
       devstack_services:
         # disable Nova services
         n-api: false
@@ -145,8 +138,6 @@
     vars:
       tox_envlist: fullstack
       tox_install_siblings: false
-      devstack_localrc:
-        USE_PYTHON3: true
       devstack_local_conf:
         post-config:
           $ZUN_CONF: