From 820e4004f3fd17a5daee955f7a1443b1501caaad Mon Sep 17 00:00:00 2001 From: Laura Flores Date: Fri, 7 Jun 2024 12:30:33 -0500 Subject: [PATCH] qa/suites/rados/thrash-old-clients: update supported releases and distro thrash-old-clients tests should only support N-3 releases. To fix this for main, I have removed all releases < quincy and have added squid. Also, we are fully switching to centos.9_stream packages/containers after the centos.8_stream end of life, so I changed the distro from centos.8_stream to centos.9_stream. *** Note: If this commit is backported, it should be done in such a way that only releases >= quincy reference centos.9_stream. For instance, if backporting to squid, a reef/squid thrash test is okay to make references to centos.9_stream since both reef and squid support this, but a pacific/squid test will have to take a different approach since pacific does not support centos.9_stream. Fixes: https://tracker.ceph.com/issues/66398 Signed-off-by: Laura Flores --- .../centos_8.stream_container_tools.yaml | 1 - .../0-distro$/centos_9.stream.yaml | 1 + .../1-install/nautilus-v1only.yaml | 26 -------------- .../1-install/nautilus-v2only.yaml | 26 -------------- .../1-install/nautilus.yaml | 21 ----------- .../thrash-old-clients/1-install/pacific.yaml | 35 ------------------- .../1-install/{octopus.yaml => squid.yaml} | 2 +- 7 files changed, 2 insertions(+), 110 deletions(-) delete mode 120000 qa/suites/rados/thrash-old-clients/0-distro$/centos_8.stream_container_tools.yaml create mode 120000 qa/suites/rados/thrash-old-clients/0-distro$/centos_9.stream.yaml delete mode 100644 qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml delete mode 100644 qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml delete mode 100644 qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml delete mode 100644 qa/suites/rados/thrash-old-clients/1-install/pacific.yaml rename qa/suites/rados/thrash-old-clients/1-install/{octopus.yaml => squid.yaml} (97%) diff --git a/qa/suites/rados/thrash-old-clients/0-distro$/centos_8.stream_container_tools.yaml b/qa/suites/rados/thrash-old-clients/0-distro$/centos_8.stream_container_tools.yaml deleted file mode 120000 index 7a86f967f020..000000000000 --- a/qa/suites/rados/thrash-old-clients/0-distro$/centos_8.stream_container_tools.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.stream_container_tools.yaml \ No newline at end of file diff --git a/qa/suites/rados/thrash-old-clients/0-distro$/centos_9.stream.yaml b/qa/suites/rados/thrash-old-clients/0-distro$/centos_9.stream.yaml new file mode 120000 index 000000000000..dca92ddbf45e --- /dev/null +++ b/qa/suites/rados/thrash-old-clients/0-distro$/centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/podman/centos_9.stream.yaml \ No newline at end of file diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml deleted file mode 100644 index 39c5eb4a1afb..000000000000 --- a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml +++ /dev/null @@ -1,26 +0,0 @@ -overrides: - ceph: - mon_bind_msgr2: false - log-ignorelist: - - \(MON_DOWN\) - conf: - global: - ms type: async - ms bind msgr2: false -tasks: -- install: - branch: nautilus - exclude_packages: - - cephadm - - ceph-mgr-cephadm - - ceph-immutable-object-cache - - python3-rados - - python3-rgw - - python3-rbd - - python3-cephfs - - ceph-volume - extra_packages: - - python-rados - - python-rgw - - python-rbd - - python-cephfs diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml deleted file mode 100644 index 61337e0e69cc..000000000000 --- a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml +++ /dev/null @@ -1,26 +0,0 @@ -overrides: - ceph: - log-ignorelist: - - \(MON_DOWN\) - conf: - global: - ms type: async - ms bind msgr2: true - ms bind msgr1: false -tasks: -- install: - branch: nautilus - exclude_packages: - - cephadm - - ceph-mgr-cephadm - - ceph-immutable-object-cache - - python3-rados - - python3-rgw - - python3-rbd - - python3-cephfs - - ceph-volume - extra_packages: - - python-rados - - python-rgw - - python-rbd - - python-cephfs diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml deleted file mode 100644 index cd05b71f5f3d..000000000000 --- a/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml +++ /dev/null @@ -1,21 +0,0 @@ -overrides: - ceph: - log-ignorelist: - - \(MON_DOWN\) -tasks: -- install: - branch: nautilus - exclude_packages: - - cephadm - - ceph-mgr-cephadm - - ceph-immutable-object-cache - - python3-rados - - python3-rgw - - python3-rbd - - python3-cephfs - - ceph-volume - extra_packages: - - python-rados - - python-rgw - - python-rbd - - python-cephfs diff --git a/qa/suites/rados/thrash-old-clients/1-install/pacific.yaml b/qa/suites/rados/thrash-old-clients/1-install/pacific.yaml deleted file mode 100644 index a266292525ac..000000000000 --- a/qa/suites/rados/thrash-old-clients/1-install/pacific.yaml +++ /dev/null @@ -1,35 +0,0 @@ -overrides: - ceph: - log-ignorelist: - - \(MON_DOWN\) -tasks: -- install: - branch: pacific - exclude_packages: - - ceph-mgr-dashboard - - ceph-mgr-diskprediction-local - - ceph-mgr-rook - - ceph-mgr-cephadm - - ceph-base-debuginfo - - ceph-common-debuginfo - - ceph-immutable-object-cache-debuginfo - - ceph-radosgw-debuginfo - - ceph-test-debuginfo - - ceph-base-debuginfo - - ceph-mgr-debuginfo - - ceph-mds-debuginfo - - ceph-mon-debuginfo - - ceph-osd-debuginfo - - ceph-fuse-debuginfo - - librados-devel-debuginfo - - libcephfs2-debuginfo - - librados2-debuginfo - - librbd1-debuginfo - - python3-cephfs-debuginfo - - python3-rados-debuginfo - - python3-rbd-debuginfo - - python3-rgw-debuginfo - - rbd-fuse-debuginfo - - rbd-mirror-debuginfo - - rbd-nbd-debuginfo - - ceph-volume diff --git a/qa/suites/rados/thrash-old-clients/1-install/octopus.yaml b/qa/suites/rados/thrash-old-clients/1-install/squid.yaml similarity index 97% rename from qa/suites/rados/thrash-old-clients/1-install/octopus.yaml rename to qa/suites/rados/thrash-old-clients/1-install/squid.yaml index 39d1da2327cd..f1e7b5d90560 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/octopus.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/squid.yaml @@ -4,7 +4,7 @@ overrides: - \(MON_DOWN\) tasks: - install: - branch: octopus + branch: squid exclude_packages: - ceph-mgr-dashboard - ceph-mgr-diskprediction-local -- 2.47.3