From abda1bc5852d61bff5e4289c35f0d7f6605c7c0c Mon Sep 17 00:00:00 2001 From: Dhairya Parmar Date: Thu, 4 Apr 2024 17:55:52 +0530 Subject: [PATCH] qa: upgrade sub-suite nofs from n-1 and n-2 releases also adjust the respective upgrade YAMLs and move to centos9. For reef release, start upgrade from pacific/quincy. Fixes: https://tracker.ceph.com/issues/65580 Signed-off-by: Dhairya Parmar Signed-off-by: Venky Shankar (cherry picked from commit f00a69f714dd07d580731a326aff41cacca6d0b6) (cherry picked from commit e06d1d6c1d4198d629a941d9777131f65d21b10b) --- qa/suites/fs/upgrade/nofs/centos_8.yaml | 1 - qa/suites/fs/upgrade/nofs/centos_9.stream.yaml | 1 + .../nofs/tasks/{0-pacific.yaml => 0-from/quincy.yaml} | 8 ++++---- qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 120000 qa/suites/fs/upgrade/nofs/centos_8.yaml create mode 120000 qa/suites/fs/upgrade/nofs/centos_9.stream.yaml rename qa/suites/fs/upgrade/nofs/tasks/{0-pacific.yaml => 0-from/quincy.yaml} (82%) diff --git a/qa/suites/fs/upgrade/nofs/centos_8.yaml b/qa/suites/fs/upgrade/nofs/centos_8.yaml deleted file mode 120000 index 5dceec7e222bd..0000000000000 --- a/qa/suites/fs/upgrade/nofs/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/nofs/centos_9.stream.yaml b/qa/suites/fs/upgrade/nofs/centos_9.stream.yaml new file mode 120000 index 0000000000000..dc442c241498c --- /dev/null +++ b/qa/suites/fs/upgrade/nofs/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/nofs/tasks/0-pacific.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-from/quincy.yaml similarity index 82% rename from qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml rename to qa/suites/fs/upgrade/nofs/tasks/0-from/quincy.yaml index b74accc69f09d..7d36116499ecc 100644 --- a/qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml +++ b/qa/suites/fs/upgrade/nofs/tasks/0-from/quincy.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/pacific latest + install ceph/quincy latest tasks: - install: - branch: pacific + branch: quincy exclude_packages: - librados3 - ceph-mgr-dashboard @@ -13,7 +13,7 @@ tasks: - cephadm - ceph-volume extra_packages: ['librados2'] -- print: "**** done installing pacific" +- print: "**** done installing quincy" - ceph: log-ignorelist: - overall HEALTH_ @@ -35,5 +35,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client pacific + - ceph osd set-require-min-compat-client quincy - print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml index 858142871383f..2530130008c33 100644 --- a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml +++ b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml @@ -38,7 +38,7 @@ tasks: - ceph versions - ceph osd dump -f json-pretty - ceph fs dump - - ceph osd require-osd-release quincy + - ceph osd require-osd-release reef - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done - ceph.healthy: - print: "**** done ceph.restart" -- 2.39.5