From 878b00013b01e3d02a704ce7c9fac1629cd1a705 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>
Date: Tue, 5 Apr 2022 16:53:34 +0200
Subject: Move to CentOS Stream 9

OpenStack 'zed' requires Python 3.8+ so RHEL 8 family has to go.

This changeset moves to CentOS Stream 9 while move to RockyLinux 9 is
planned as final solution.

CI moved to CentOS Stream 9 nodes.

Depends-on: https://review.opendev.org/c/openstack/kolla-ansible/+/839715

Change-Id: I113b9984294cf8663d3fc0c8840320e1d40ea731
---
 tests/playbooks/pre.yml               | 16 +++++++---------
 tests/templates/template_overrides.j2 |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'tests')

diff --git a/tests/playbooks/pre.yml b/tests/playbooks/pre.yml
index 2e8f3c888..5a2c01c53 100644
--- a/tests/playbooks/pre.yml
+++ b/tests/playbooks/pre.yml
@@ -18,26 +18,24 @@
         path: "{{ kolla_build_logs_dir }}"
         state: directory
 
-    - name: Install Python3 setuptools and family
+    - name: Install Python3 pip and setuptools
       package:
         name:
           - python3-pip
           - python3-setuptools
-          - python3-virtualenv
-          - python3-wheel
       become: true
 
-    # NOTE(hrw): On RedHat systems it is part of python3-virtualenv
-    - name: Install virtualenv on Debian systems
+    # NOTE(hrw): On RedHat systems venv is part of python3-libs
+    - name: Install Python3 venv on Debian systems
       package:
         name:
-          - virtualenv
+          - python3-venv
       become: true
       when:
         ansible_os_family == "Debian"
 
     - name: Create virtualenv
-      command: python3 -m virtualenv {{ virtualenv_path }} --python python3
+      command: python3 -m venv {{ virtualenv_path }}
 
     - name: Install kolla
       command: "{{ virtualenv_path }}/bin/python -m pip install {{ zuul.project.src_dir }}"
@@ -58,11 +56,11 @@
 
     - name: Configure Docker repo for CentOS
       block:
-        - name: Add Docker YUM repository
+        - name: Add Docker repository
           yum_repository:
             name: docker
             description: Docker
-            baseurl: "{{ nodepool_docker_proxy }}/centos/7/$basearch/stable"
+            baseurl: "{{ nodepool_docker_proxy }}/centos/9/$basearch/stable"
             enabled: yes
             gpgcheck: yes
             gpgkey: "{{ nodepool_docker_proxy }}/centos/gpg"
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2
index 5112bafa7..932917c3c 100644
--- a/tests/templates/template_overrides.j2
+++ b/tests/templates/template_overrides.j2
@@ -23,7 +23,7 @@ RUN echo registry={{ nodepool_npmjs_proxy }} > /etc/npmrc \
 RUN sed -i \
         -e "s|^\(mirrorlist.*\)|#\1|" \
         -e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
-        /etc/yum.repos.d/CentOS-*.repo
+        /etc/yum.repos.d/centos*.repo
 
 {% raw %}
 {% endblock %}
@@ -46,7 +46,7 @@ RUN sed -i \
         -e "s|^#baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
         -e "s|^baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
         -e "s|^baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
-        /etc/yum.repos.d/CentOS-*.repo \
+        /etc/yum.repos.d/centos*.repo \
     && sed -i \
         -e "s|^\(metalink.*\)|#\1|" \
         -e "s|^#baseurl=http://download.example/pub|baseurl=http://{{ nodepool_mirror_host }}|" \
-- 
cgit v1.2.3