From: Dhairya Parmar Date: Tue, 30 Apr 2024 11:09:19 +0000 (+0530) Subject: qa: upgrade sub-suite upgraded_client from from n-1|n-2 releases X-Git-Tag: v18.2.4~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a40974da8c0df9aaec5835a5f9d60f5bb7cfe688;p=ceph.git 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) Conflicts: qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml qa/suites/fs/upgrade/upgraded_client/tasks/0-install.yaml qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml (cherry picked from commit 329c440eec172401c3b58646b44d415628148ec3) --- diff --git a/qa/suites/fs/upgrade/upgraded_client/centos_8.yaml b/qa/suites/fs/upgrade/upgraded_client/centos_8.yaml deleted file mode 120000 index 5dceec7e222b..000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/centos_8.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/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 000000000000..dc442c241498 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/centos_9.stream.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_9.stream.yaml \ No newline at end of file diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml deleted file mode 100644 index 02f541eaf30f..000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml +++ /dev/null @@ -1,53 +0,0 @@ -meta: -- desc: | - install ceph/nautilus latest -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 - # For kernel_untar_build workunit - extra_system_packages: - - bison - - flex - - elfutils-libelf-devel - - openssl-devel - - NetworkManager - - iproute - - util-linux -- print: "**** done installing nautilus" -- 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 nautilus -- print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml deleted file mode 100644 index defb0392259a..000000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml +++ /dev/null @@ -1,53 +0,0 @@ -meta: -- desc: | - install ceph/pacific latest -tasks: -- install: - branch: pacific - 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 pacific" -- 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 pacific -- 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 index 000000000000..356f87787446 --- /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" \ No newline at end of file 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 cb8ac4d4f2d1..bed83610ff00 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: