From 490dcfcd2f5bb7cdced9d74175588c7cc0f7b44a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Nasiadka?= <mnasiadka@gmail.com>
Date: Wed, 28 Apr 2021 18:23:20 +0200
Subject: [PATCH] CI: Remove kolla_python_version from Debian/Ubuntu jobs

These are leftovers from Focal and Bullseye upgrades.

Change-Id: Id32dd40854f728ea5e058c391d70f9f3a2a0bd37
(cherry picked from commit 29b16b8a8dad14259465c5fe9944a148e702f770)
---
 .zuul.d/debian.yaml |  8 ++------
 .zuul.d/ubuntu.yaml | 42 +++++-------------------------------------
 2 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml
index b1a32dac0c..0ae1ef5de5 100644
--- a/.zuul.d/debian.yaml
+++ b/.zuul.d/debian.yaml
@@ -4,15 +4,11 @@
       jobs:
         - kolla-build-debian-source
         - kolla-build-debian-binary
-        - kolla-ansible-debian-source:
-            vars:
-              kolla_python_version: 3.9
+        - kolla-ansible-debian-source
     check-arm64:
       jobs:
         - kolla-build-debian-source-aarch64
-        - kolla-ansible-debian-source-aarch64:
-            vars:
-              kolla_python_version: 3.9
+        - kolla-ansible-debian-source-aarch64
     periodic:
       jobs:
         - kolla-publish-debian-source-quay
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml
index f25e8969cc..0e7208eb16 100644
--- a/.zuul.d/ubuntu.yaml
+++ b/.zuul.d/ubuntu.yaml
@@ -4,25 +4,15 @@
       jobs:
         - kolla-build-ubuntu-binary
         - kolla-build-ubuntu-source
-        - kolla-ansible-ubuntu-source:
-            vars:
-              kolla_python_version: 3.8
-        - kolla-ansible-ubuntu-binary:
-            vars:
-              kolla_python_version: 3.8
-        - kolla-ansible-ubuntu-source-upgrade:
-            vars:
-              kolla_python_version: 3.8
+        - kolla-ansible-ubuntu-source
+        - kolla-ansible-ubuntu-binary
+        - kolla-ansible-ubuntu-source-upgrade
     gate:
       queue: kolla
       jobs:
         - kolla-build-ubuntu-source
-        - kolla-ansible-ubuntu-source:
-            vars:
-              kolla_python_version: 3.8
-        - kolla-ansible-ubuntu-source-upgrade:
-            vars:
-              kolla_python_version: 3.8
+        - kolla-ansible-ubuntu-source
+        - kolla-ansible-ubuntu-source-upgrade
     periodic:
       jobs:
         - kolla-publish-ubuntu-source-quay
@@ -37,48 +27,26 @@
         # Test rabbitmq and mariadb in multinode ceph jobs.
         - kolla-ansible-ubuntu-source-ceph-ansible:
             files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
-            vars:
-              kolla_python_version: 3.8
         - kolla-ansible-ubuntu-source-upgrade-ceph-ansible:
             files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
-            vars:
-              kolla_python_version: 3.8
         - kolla-ansible-ubuntu-source-zun:
             files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
-            vars:
-              kolla_python_version: 3.8
         - kolla-ansible-ubuntu-source-ironic:
             files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
-            vars:
-              kolla_python_version: 3.8
         - kolla-ansible-ubuntu-source-swift:
             files: ^docker/(base|openstack-base|glance|swift)/
-            vars:
-              kolla_python_version: 3.8
         - kolla-ansible-ubuntu-source-mariadb:
             files: ^docker/(base|mariadb)/
-            vars:
-              kolla_python_version: 3.8
         - kolla-ansible-ubuntu-source-masakari:
             files: ^docker/(base|masakari|openstack-base)/
-            vars:
-              kolla_python_version: 3.8
         - kolla-ansible-ubuntu-source-linuxbridge:
             files: ^docker/(base|neutron|openstack-base)/
-            vars:
-              kolla_python_version: 3.8
         - kolla-ansible-ubuntu-source-ovn:
             files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
-            vars:
-              kolla_python_version: 3.8
         - kolla-ansible-ubuntu-source-prometheus-efk:
             files: ^docker/(base|elasticsearch|grafana|kibana|prometheus)/
-            vars:
-              kolla_python_version: 3.8
         - kolla-ansible-ubuntu-source-kvm:
             files: ^docker/nova/
-            vars:
-              kolla_python_version: 3.8
 
 - job:
     name: kolla-build-ubuntu-binary