From 659288ed1d7453cdbd54a3e9d87129e7526205e4 Mon Sep 17 00:00:00 2001 From: Sidharth Anupkrishnan Date: Tue, 2 Mar 2021 22:14:03 +0530 Subject: [PATCH] qa: Update featureful_client suite to use octopus instead of nautilus Signed-off-by: Sidharth Anupkrishnan --- .../old_client/tasks/{0-nautilus.yaml => 0-octopus.yaml} | 8 ++++---- .../featureful_client/old_client/tasks/1-client.yaml | 2 +- .../featureful_client/old_client/tasks/2-upgrade.yaml | 2 +- .../tasks/{0-nautilus.yaml => 0-octopus.yaml} | 8 ++++---- .../featureful_client/upgraded_client/tasks/1-client.yaml | 2 +- .../upgraded_client/tasks/2-upgrade.yaml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) rename qa/suites/fs/upgrade/featureful_client/old_client/tasks/{0-nautilus.yaml => 0-octopus.yaml} (81%) rename qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/{0-nautilus.yaml => 0-octopus.yaml} (81%) diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-octopus.yaml similarity index 81% rename from qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml rename to qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-octopus.yaml index c89d18be64fa..40d34753da1b 100644 --- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml +++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-octopus.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/nautilus latest + install ceph/octopus latest tasks: - install: - branch: nautilus + branch: octopus exclude_packages: - librados3 - ceph-mgr-dashboard @@ -12,7 +12,7 @@ tasks: - ceph-mgr-cephadm - cephadm extra_packages: ['librados2'] -- print: "**** done installing nautilus" +- print: "**** done installing octopus" - ceph: log-ignorelist: - overall HEALTH_ @@ -34,5 +34,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client nautilus + - ceph osd set-require-min-compat-client octopus - print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml index 50092616f550..976d6e2650bf 100644 --- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml +++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml @@ -1,6 +1,6 @@ tasks: - ceph-fuse: -- print: "**** done nautilus client" +- print: "**** done octopus client" - workunit: clients: all: 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 0d22a26a612f..41485dac44a2 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,6 @@ tasks: - ceph versions - ceph osd require-osd-release octopus - 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 nautilus + #- ceph osd set-require-min-compat-client octopus - ceph.healthy: - print: "**** done ceph.restart" diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-octopus.yaml similarity index 81% rename from qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml rename to qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-octopus.yaml index c89d18be64fa..40d34753da1b 100644 --- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-octopus.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/nautilus latest + install ceph/octopus latest tasks: - install: - branch: nautilus + branch: octopus exclude_packages: - librados3 - ceph-mgr-dashboard @@ -12,7 +12,7 @@ tasks: - ceph-mgr-cephadm - cephadm extra_packages: ['librados2'] -- print: "**** done installing nautilus" +- print: "**** done installing octopus" - ceph: log-ignorelist: - overall HEALTH_ @@ -34,5 +34,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client nautilus + - ceph osd set-require-min-compat-client octopus - print: "**** done ceph" diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml index d45fd6aeb5f3..c9b4c046f6c4 100644 --- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml @@ -3,7 +3,7 @@ overrides: nuke-on-error: false tasks: - ceph-fuse: -- print: "**** done nautilus client" +- print: "**** done octopus client" #- workunit: # clients: # all: 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 687cac4e57b4..0df6f13c7399 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,6 @@ tasks: - ceph osd dump -f json-pretty - ceph osd require-osd-release octopus - 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 nautilus + #- ceph osd set-require-min-compat-client octopus - ceph.healthy: - print: "**** done ceph.restart" -- 2.47.3