From 959b81870d9b0e1931b5c36350c02c0c02e0565a Mon Sep 17 00:00:00 2001
From: Venky Shankar <vshankar@redhat.com>
Date: Wed, 24 Jan 2024 11:49:27 +0530
Subject: [PATCH] Revert "reef: qa: add support/qa for cephfs-shell on CentOS 9
 / RHEL9"

Signed-off-by: Venky Shankar <vshankar@redhat.com>
---
 PendingReleaseNotes                        | 2 --
 ceph.spec.in                               | 2 +-
 qa/cephfs/begin/0-install.yaml             | 1 -
 qa/suites/fs/shell/distro                  | 2 +-
 qa/suites/fs/shell/tasks/cephfs-shell.yaml | 7 ++++---
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index f064930c1f40e..6722b1f8fe1c7 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -1,7 +1,5 @@
 >=19.0.0
 
-* The cephfs-shell utility is now packaged for RHEL 9 / CentOS 9 as required
-  python dependencies are now available in EPEL9.
 * RGW: S3 multipart uploads using Server-Side Encryption now replicate correctly in
   multi-site. Previously, the replicas of such objects were corrupted on decryption.
   A new tool, ``radosgw-admin bucket resync encrypted multipart``, can be used to
diff --git a/ceph.spec.in b/ceph.spec.in
index 482b705d65848..ff8aa5aafbff8 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -98,7 +98,7 @@
 %else
 %bcond_without jaeger
 %endif
-%if 0%{?fedora} || 0%{?suse_version} >= 1500 || 0%{?rhel} >= 9
+%if 0%{?fedora} || 0%{?suse_version} >= 1500
 # distros that ship cmd2 and/or colorama
 %bcond_without cephfs_shell
 %else
diff --git a/qa/cephfs/begin/0-install.yaml b/qa/cephfs/begin/0-install.yaml
index c995efca941d0..413958f1111ad 100644
--- a/qa/cephfs/begin/0-install.yaml
+++ b/qa/cephfs/begin/0-install.yaml
@@ -3,7 +3,6 @@ tasks:
       extra_packages:
         rpm:
         - python3-cephfs
-        - cephfs-shell
         - cephfs-top
         - cephfs-mirror
         deb:
diff --git a/qa/suites/fs/shell/distro b/qa/suites/fs/shell/distro
index 23d9e9be86f0d..0862b4457b37a 120000
--- a/qa/suites/fs/shell/distro
+++ b/qa/suites/fs/shell/distro
@@ -1 +1 @@
-.qa/distros/supported
\ No newline at end of file
+.qa/distros/supported-random-distro$
\ No newline at end of file
diff --git a/qa/suites/fs/shell/tasks/cephfs-shell.yaml b/qa/suites/fs/shell/tasks/cephfs-shell.yaml
index 55cd07598741f..9708252e908a2 100644
--- a/qa/suites/fs/shell/tasks/cephfs-shell.yaml
+++ b/qa/suites/fs/shell/tasks/cephfs-shell.yaml
@@ -1,6 +1,7 @@
-teuthology:
-  postmerge:
-    - if not (yaml.os_type == "ubuntu" or yaml.os_type == "centos"  and yaml.os_version == "9.stream") then reject() end
+# Right now, cephfs-shell is only available as a package on Ubuntu
+# This overrides the random distribution that's chosen in the other yaml fragments.
+os_type: ubuntu
+os_version: "20.04"
 tasks:
   - cephfs_test_runner:
       modules:
-- 
2.39.5