From: Xiubo Li Date: Wed, 22 Mar 2023 00:56:46 +0000 (+0800) Subject: qa: remove the '0-' prefix X-Git-Tag: v19.0.0~1501^2~4 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e123fcaadc881481659a084f418436c408f4aeca;p=ceph-ci.git qa: remove the '0-' prefix Both the nautilus and pacific will be run in parallel. Fixes: https://tracker.ceph.com/issues/57591 Signed-off-by: Xiubo Li --- diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/0-nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/0-nautilus.yaml deleted file mode 100644 index 02f541eaf30..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/0-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/0-pacific.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/0-pacific.yaml deleted file mode 100644 index defb0392259..00000000000 --- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/0-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-from/nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml new file mode 100644 index 00000000000..02f541eaf30 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml @@ -0,0 +1,53 @@ +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 new file mode 100644 index 00000000000..defb0392259 --- /dev/null +++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml @@ -0,0 +1,53 @@ +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"