From 0416165ee2610cdfd18ac3b8734f3272d7e8d607 Mon Sep 17 00:00:00 2001
From: "Dr. Jens Harbott" <harbott@osism.tech>
Date: Sun, 2 Apr 2023 13:52:34 +0200
Subject: [PATCH] Drop check-uc jobs for py38

Python3.8 is no longer part of the PTI and some libraries are dropping
support for it in new releases. Make our life easy and stop generating
and checking constraints for it rather than reintroducing python_version
specific constraints again.

Change-Id: Iee6b65ad1cac13df33ea96119f3cf4b70e2e307e
---
 .zuul.d/jobs.yaml    | 16 ----------------
 .zuul.d/project.yaml |  6 ------
 tox.ini              |  9 +--------
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index 6e9bda489f..09645c76a5 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -12,16 +12,6 @@
     vars:
       tox_envlist: babel
 
-- job:
-    name: requirements-tox-py38-check-uc
-    parent: openstack-tox-py38
-    description: |
-      Run test for requirements project.
-
-      Uses tox with the ``py38-check-uc`` environment.
-    files: ^upper-constraints.*txt$
-    vars:
-      tox_envlist: py38-check-uc
 - job:
     name: requirements-tox-py39-check-uc
     parent: openstack-tox-py39
@@ -64,9 +54,3 @@
     files: ^bindep.txt$
     vars:
       tox_envlist: bindep
-
-- job:
-    name: requirements-tox-py38-check-uc-aarch64
-    parent: requirements-tox-py38-check-uc
-    nodeset: ubuntu-focal-arm64
-    timeout: 7200
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index 7e9038ba96..164375b9ed 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -28,7 +28,6 @@
         - requirements-tox-babel
         - requirements-tox-bindep:
             voting: false
-        - requirements-tox-py38-check-uc
         - requirements-tox-py39-check-uc
         - requirements-tox-py310-check-uc
         - requirements-tox-validate-projects:
@@ -65,10 +64,6 @@
               - ^setup.cfg$
     check-arm64:
       jobs:
-        - requirements-tox-py38-check-uc-aarch64:
-            files:
-              - bindep.txt
-              - upper-constraints.txt
         - build-wheel-cache-centos-8-stream-arm64:
             files:
               - bindep.txt
@@ -109,7 +104,6 @@
               - bindep.txt
         - openstack-tox-validate
         - requirements-tox-babel
-        - requirements-tox-py38-check-uc
         - requirements-tox-py39-check-uc
         - requirements-tox-py310-check-uc
         - cross-cinder-py310
diff --git a/tox.ini b/tox.ini
index 45cccf2227..e00e230daa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,13 +16,6 @@ deps = -c{toxinidir}/upper-constraints.txt
 commands =
   stestr run {posargs}
 
-[testenv:py38-check-uc]
-allowlist_externals =
-  check-conflicts
-basepython = python3.8
-deps = -r{toxinidir}/upper-constraints.txt
-commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
-
 [testenv:py39-check-uc]
 allowlist_externals =
   check-conflicts
@@ -50,7 +43,7 @@ description = Regenerates upper-constraints.txt
 # Generate needs an unconstrained install to get new dependencies
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = generate-constraints {posargs: -b blacklist.txt -r global-requirements.txt -p python3.6 -p python3.7 -p python3.8 -p python3.9 -p python3.10 > upper-constraints.txt}
+commands = generate-constraints {posargs: -b blacklist.txt -r global-requirements.txt -p python3.9 -p python3.10 > upper-constraints.txt}
 
 [testenv:validate]
 allowlist_externals =