qa: upgrade sub-suite upgraded_client from from n-1|n-2 releases

... and move to centos9.

Fixes: https://tracker.ceph.com/issues/65580
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 76589659480c6e9cd2ad09b3be21deeb6d1686d1)

diff --git a/qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml
deleted file mode 100644 (file)
index 9b1db62..0000000
--- a/qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-teuthology:
-  branch: nautilus

diff --git a/qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml b/qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml
deleted file mode 100644 (file)
index d86c55a..0000000
--- a/qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-teuthology:
-  branch: pacific

diff --git a/qa/suites/fs/upgrade/upgraded_client/centos_8.stream.yaml b/qa/suites/fs/upgrade/upgraded_client/centos_8.stream.yaml
deleted file mode 120000 (symlink)
index e787191..0000000
--- a/qa/suites/fs/upgrade/upgraded_client/centos_8.stream.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/centos_8.stream.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/upgrade/upgraded_client/centos_9.stream.yaml b/qa/suites/fs/upgrade/upgraded_client/centos_9.stream.yaml
new file mode 120000 (symlink)
index 0000000..dca92dd
--- /dev/null
+++ b/qa/suites/fs/upgrade/upgraded_client/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/fs/upgrade/upgraded_client/tasks/0-install.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install.yaml
deleted file mode 100644 (file)
index 5b25037..0000000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-install.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-teuthology:
-  premerge: |
-            local branch = yaml.teuthology.branch
-            yaml_fragment['tasks'][0]['install']['branch'] = tostring(branch)
-            print_branch = "**** done installing "..tostring(branch)
-            yaml_fragment['tasks'][1]['print'] = print_branch
-            local exec = yaml_fragment['tasks'][3]['exec']['osd.0']
-            local set_compat = "ceph osd set-require-min-compat-client "..tostring(branch)
-            py_attrgetter(exec).append(set_compat)
-tasks:
-- install:
-    branch: []
-    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
-    # For kernel_untar_build workunit
-    extra_system_packages:
-      - bison
-      - flex
-      - elfutils-libelf-devel
-      - openssl-devel
-      - NetworkManager
-      - iproute
-      - util-linux
-- print: []
-- ceph:
-    log-ignorelist:
-      - overall HEALTH_
-      - \(FS_
-      - \(MDS_
-      - \(OSD_
-      - \(MON_DOWN\)
-      - \(CACHE_POOL_
-      - \(POOL_
-      - \(MGR_DOWN\)
-      - \(PG_
-      - \(SMALLER_PGP_NUM\)
-      - Monitor daemon marked osd
-      - Behind on trimming
-      - Manager daemon
-    conf:
-      global:
-        mon warn on pool no app: false
-        ms bind msgr2: false
-- exec:
-    osd.0: []
-- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml
new file mode 100644 (file)
index 0000000..4e861be
--- /dev/null
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml
@@ -0,0 +1,53 @@
+meta:
+- desc: |
+   install ceph/quincy latest
+tasks:
+- install:
+    branch: quincy
+    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
+    # For kernel_untar_build workunit
+    extra_system_packages:
+      - bison
+      - flex
+      - elfutils-libelf-devel
+      - openssl-devel
+      - NetworkManager
+      - iproute
+      - util-linux
+- print: "**** done installing quincy"
+- ceph:
+    log-ignorelist:
+      - overall HEALTH_
+      - \(FS_
+      - \(MDS_
+      - \(OSD_
+      - \(MON_DOWN\)
+      - \(CACHE_POOL_
+      - \(POOL_
+      - \(MGR_DOWN\)
+      - \(PG_
+      - \(SMALLER_PGP_NUM\)
+      - Monitor daemon marked osd
+      - Behind on trimming
+      - Manager daemon
+    conf:
+      global:
+        mon warn on pool no app: false
+        ms bind msgr2: false
+- exec:
+    osd.0:
+      - ceph osd set-require-min-compat-client quincy
+- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/reef.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/reef.yaml
new file mode 100644 (file)
index 0000000..0a42334
--- /dev/null
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/reef.yaml
@@ -0,0 +1,53 @@
+meta:
+- desc: |
+   install ceph/reef latest
+tasks:
+- install:
+    branch: reef
+    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
+    # For kernel_untar_build workunit
+    extra_system_packages:
+      - bison
+      - flex
+      - elfutils-libelf-devel
+      - openssl-devel
+      - NetworkManager
+      - iproute
+      - util-linux
+- print: "**** done installing reef"
+- ceph:
+    log-ignorelist:
+      - overall HEALTH_
+      - \(FS_
+      - \(MDS_
+      - \(OSD_
+      - \(MON_DOWN\)
+      - \(CACHE_POOL_
+      - \(POOL_
+      - \(MGR_DOWN\)
+      - \(PG_
+      - \(SMALLER_PGP_NUM\)
+      - Monitor daemon marked osd
+      - Behind on trimming
+      - Manager daemon
+    conf:
+      global:
+        mon warn on pool no app: false
+        ms bind msgr2: false
+- exec:
+    osd.0:
+      - ceph osd set-require-min-compat-client reef
+- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml
index cb8ac4d4f2d1259caaa551128d100764a48a1483..bed83610ff00471926edac9aaa88e376a9fda451 100644 (file)
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml
@@ -1,13 +1,4 @@
 teuthology:
-  premerge: |
-            local branch = yaml.teuthology.branch
-            if tostring(branch) == "nautilus" then
-              yaml_fragment['tasks'][2]['install.upgrade']['client.0']['branch'] = "pacific"
-            elseif tostring(branch) == "pacific" then
-              yaml_fragment['tasks'][2]['install.upgrade']['client.0']['branch'] = "reef"
-            else
-              error("invalid source branch")
-            end
   postmerge:
     - if not is_fuse() then reject() end
 tasks:
@@ -17,7 +8,6 @@ tasks:
 - print: "**** done unmount client.0"
 - install.upgrade:
     client.0:
-      branch: []
 - print: "**** done install.upgrade on client.0"
 - ceph.healthy:
 - ceph-fuse: