From d42db1b8f67277088f7e743cdca5fe99b6327c9b Mon Sep 17 00:00:00 2001 From: Dhairya Parmar Date: Tue, 30 Apr 2024 16:39:19 +0530 Subject: [PATCH] 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 Signed-off-by: Venky Shankar (cherry picked from commit 76589659480c6e9cd2ad09b3be21deeb6d1686d1) (cherry picked from commit 96b0d734cb8097103be017053a242512313db4d8) --- .../upgraded_client/branch/nautilus.yaml | 2 - .../upgraded_client/branch/pacific.yaml | 2 - .../upgraded_client/centos_8.stream.yaml | 1 - .../upgraded_client/centos_9.stream.yaml | 1 + .../{0-install.yaml => 0-install/quincy.yaml} | 19 +++---- .../upgraded_client/tasks/0-install/reef.yaml | 53 +++++++++++++++++++ .../tasks/2-clients/fuse-upgrade.yaml | 10 ---- 7 files changed, 61 insertions(+), 27 deletions(-) delete mode 100644 qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml delete mode 100644 qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml delete mode 120000 qa/suites/fs/upgrade/upgraded_client/centos_8.stream.yaml create mode 120000 qa/suites/fs/upgrade/upgraded_client/centos_9.stream.yaml rename qa/suites/fs/upgrade/upgraded_client/tasks/{0-install.yaml => 0-install/quincy.yaml} (64%) create mode 100644 qa/suites/fs/upgrade/upgraded_client/tasks/0-install/reef.yaml 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 index 9b1db62e47f5a..0000000000000 --- 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 index d86c55a34f9dc..0000000000000 --- 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 index e787191b5a270..0000000000000 --- 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 index 0000000000000..dca92ddbf45e5 --- /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/quincy.yaml similarity index 64% rename from qa/suites/fs/upgrade/upgraded_client/tasks/0-install.yaml rename to qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml index 5b250375a00e1..4e861bea8b03d 100644 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-install.yaml +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml @@ -1,15 +1,9 @@ -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) +meta: +- desc: | + install ceph/quincy latest tasks: - install: - branch: [] + branch: quincy exclude_packages: - cephadm - ceph-mgr-cephadm @@ -33,7 +27,7 @@ tasks: - NetworkManager - iproute - util-linux -- print: [] +- print: "**** done installing quincy" - ceph: log-ignorelist: - overall HEALTH_ @@ -54,5 +48,6 @@ tasks: mon warn on pool no app: false ms bind msgr2: false - exec: - osd.0: [] + 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 index 0000000000000..0a4233453fe17 --- /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 cb8ac4d4f2d12..bed83610ff004 100644 --- 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: -- 2.39.5