From: John Mulligan <jmulligan@redhat.com>
Date: Thu, 21 Aug 2025 16:54:33 +0000 (-0400)
Subject: cephadm: remove centos 8 from the cephadm build suite containers
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0e09eb62c6f397f344f96a5193c40d34d82c9a5d;p=ceph-ci.git

cephadm: remove centos 8 from the cephadm build suite containers

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 4d3e7b6bcb85f703823b6c414f414a9ff4f379aa)
---

diff --git a/src/cephadm/tests/build/test_cephadm_build.py b/src/cephadm/tests/build/test_cephadm_build.py
index 9beef67ffe0..90ce9e387fc 100644
--- a/src/cephadm/tests/build/test_cephadm_build.py
+++ b/src/cephadm/tests/build/test_cephadm_build.py
@@ -12,21 +12,11 @@ import sys
 
 
 CONTAINERS = {
-    'centos-8': {
-        'name': 'cephadm-build-test:centos8-py36',
-        'base_image': 'quay.io/centos/centos:stream8',
-        'script': 'dnf install -y python36',
-    },
     'centos-9': {
         'name': 'cephadm-build-test:centos9-py3',
         'base_image': 'quay.io/centos/centos:stream9',
         'script': 'dnf install -y python3',
     },
-    'centos-8-plusdeps': {
-        'name': 'cephadm-build-test:centos8-py36-deps',
-        'base_image': 'quay.io/centos/centos:stream8',
-        'script': 'dnf install -y python36 python3-jinja2 python3-pyyaml',
-    },
     'centos-9-plusdeps': {
         'name': 'cephadm-build-test:centos9-py3-deps',
         'base_image': 'quay.io/centos/centos:stream9',
@@ -95,7 +85,6 @@ def source_dir():
 @pytest.mark.parametrize(
     'env',
     [
-        'centos-8',
         'centos-9',
         'ubuntu-20.04',
         'ubuntu-22.04',
@@ -139,7 +128,6 @@ def test_cephadm_build(env, source_dir, tmp_path):
 @pytest.mark.parametrize(
     'env',
     [
-        'centos-8-plusdeps',
         'centos-9-plusdeps',
         'centos-9',
     ],
@@ -155,11 +143,6 @@ def test_cephadm_build_from_rpms(env, source_dir, tmp_path):
         assert res.returncode != 0
         return
     binary = tmp_path / 'cephadm'
-    if 'centos-8' in env and sys.version_info[:2] >= (3, 10):
-        # The version of markupsafe in centos 8 is incompatible with
-        # python>=3.10 due to changes in the stdlib therefore we can't execute
-        # the cephadm binary, so we quit the test early.
-        return
     assert binary.is_file()
     res = subprocess.run(
         [sys.executable, str(binary), 'version'],