From 898240c8eeb27b2aae1c919d4afacc4d47289a6a Mon Sep 17 00:00:00 2001 From: Ramana Raja Date: Wed, 6 Apr 2022 23:39:13 -0400 Subject: [PATCH] qa/suites/fs/upgrade: change octopus installations and references ... to pacific. Fixes: https://tracker.ceph.com/issues/53996 Signed-off-by: Ramana Raja --- .../featureful_client/old_client/tasks/2-upgrade.yaml | 1 - .../tasks/3-compat_client/{pacific.yaml => quincy.yaml} | 0 .../upgraded_client/tasks/2-upgrade.yaml | 1 - .../upgrade/nofs/tasks/{0-octopus.yaml => 0-pacific.yaml} | 8 ++++---- qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml | 1 - 5 files changed, 4 insertions(+), 7 deletions(-) rename qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/{pacific.yaml => quincy.yaml} (100%) rename qa/suites/fs/upgrade/nofs/tasks/{0-octopus.yaml => 0-pacific.yaml} (82%) diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml index a9eadeb8410..31d0ec3c07d 100644 --- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml +++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml @@ -43,6 +43,5 @@ tasks: - ceph versions - ceph osd require-osd-release quincy - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done - #- ceph osd set-require-min-compat-client octopus - ceph.healthy: - print: "**** done ceph.restart" diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/pacific.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/quincy.yaml similarity index 100% rename from qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/pacific.yaml rename to qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/quincy.yaml diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml index 6370f9f491e..8529be3e6d9 100644 --- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml @@ -43,6 +43,5 @@ tasks: - ceph osd dump -f json-pretty - ceph osd require-osd-release quincy - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done - #- ceph osd set-require-min-compat-client octopus - ceph.healthy: - print: "**** done ceph.restart" diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-octopus.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml similarity index 82% rename from qa/suites/fs/upgrade/nofs/tasks/0-octopus.yaml rename to qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml index e7774423fa5..b74accc69f0 100644 --- a/qa/suites/fs/upgrade/nofs/tasks/0-octopus.yaml +++ b/qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/octopus latest + install ceph/pacific latest tasks: - install: - branch: octopus + branch: pacific exclude_packages: - librados3 - ceph-mgr-dashboard @@ -13,7 +13,7 @@ tasks: - cephadm - ceph-volume extra_packages: ['librados2'] -- print: "**** done installing octopus" +- print: "**** done installing pacific" - ceph: log-ignorelist: - overall HEALTH_ @@ -35,5 +35,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client octopus + - ceph osd set-require-min-compat-client pacific - 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 5896252898a..85814287138 100644 --- a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml +++ b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml @@ -40,6 +40,5 @@ tasks: - ceph fs dump - ceph osd require-osd-release quincy - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done - #- ceph osd set-require-min-compat-client octopus - ceph.healthy: - print: "**** done ceph.restart" -- 2.47.3