From 985c203eec0263b1f564e949c05026e5177604b2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 6 Apr 2020 16:32:03 -0500 Subject: [PATCH] qa/suites/fs/upgrade: s/mimic/nautilus/ Also rename 3-compat_client/mimic -> pacific to match the min_client setting (the naming here confuses me...). Signed-off-by: Sage Weil --- .../old_client/tasks/{0-mimic.yaml => 0-nautilus.yaml} | 8 ++++---- .../featureful_client/old_client/tasks/1-client.yaml | 2 +- .../tasks/3-compat_client/{mimic.yaml => pacific.yaml} | 2 +- .../tasks/{0-mimic.yaml => 0-nautilus.yaml} | 8 ++++---- .../upgraded_client/tasks/1-client.yaml | 2 +- .../tasks/{0-mimic.yaml => 0-nautilus.yaml} | 10 +++++----- 6 files changed, 16 insertions(+), 16 deletions(-) rename qa/suites/fs/upgrade/featureful_client/old_client/tasks/{0-mimic.yaml => 0-nautilus.yaml} (82%) rename qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/{mimic.yaml => pacific.yaml} (75%) rename qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/{0-mimic.yaml => 0-nautilus.yaml} (82%) rename qa/suites/fs/upgrade/volumes/import-legacy/tasks/{0-mimic.yaml => 0-nautilus.yaml} (78%) diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml similarity index 82% rename from qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml rename to qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml index 41630e5a159..a11cb1128be 100644 --- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml +++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/mimic latest + install ceph/nautilus latest tasks: - install: - branch: mimic + branch: nautilus exclude_packages: - librados3 - ceph-mgr-dashboard @@ -12,7 +12,7 @@ tasks: - ceph-mgr-cephadm - cephadm extra_packages: ['librados2'] -- print: "**** done installing mimic" +- print: "**** done installing nautilus" - ceph: mon_bind_addrvec: false mon_bind_msgr2: false @@ -36,5 +36,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client mimic + - ceph osd set-require-min-compat-client nautilus - 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 3baa9c21846..50092616f55 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 mimic client" +- print: "**** done nautilus client" - workunit: clients: all: diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/mimic.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/pacific.yaml similarity index 75% rename from qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/mimic.yaml rename to qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/pacific.yaml index a3a51ffda43..d8761e9bd29 100644 --- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/mimic.yaml +++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/pacific.yaml @@ -6,5 +6,5 @@ tasks: - exec: mon.a: - ceph fs dump --format=json-pretty - - ceph fs set cephfs min_compat_client octopus + - ceph fs set cephfs min_compat_client pacific - fs.clients_evicted: diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml similarity index 82% rename from qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml rename to qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml index 41630e5a159..a11cb1128be 100644 --- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/mimic latest + install ceph/nautilus latest tasks: - install: - branch: mimic + branch: nautilus exclude_packages: - librados3 - ceph-mgr-dashboard @@ -12,7 +12,7 @@ tasks: - ceph-mgr-cephadm - cephadm extra_packages: ['librados2'] -- print: "**** done installing mimic" +- print: "**** done installing nautilus" - ceph: mon_bind_addrvec: false mon_bind_msgr2: false @@ -36,5 +36,5 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd set-require-min-compat-client mimic + - ceph osd set-require-min-compat-client nautilus - 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 3196e358842..d45fd6aeb5f 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 mimic client" +- print: "**** done nautilus client" #- workunit: # clients: # all: diff --git a/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-mimic.yaml b/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-nautilus.yaml similarity index 78% rename from qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-mimic.yaml rename to qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-nautilus.yaml index 1ca8973bbc2..81cc5bab41f 100644 --- a/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-mimic.yaml +++ b/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-nautilus.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/mimic latest + install ceph/nautilus latest tasks: - install: - branch: mimic #tag: v13.2.8 + branch: nautilus #tag: v13.2.8 exclude_packages: - librados3 - ceph-mgr-dashboard @@ -13,7 +13,7 @@ tasks: - ceph-mgr-cephadm - cephadm extra_packages: ['librados2'] -- print: "**** done installing mimic" +- print: "**** done installing nautilus" - ceph: mon_bind_addrvec: false mon_bind_msgr2: false @@ -37,6 +37,6 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd require-osd-release mimic - - ceph osd set-require-min-compat-client mimic + - ceph osd require-osd-release nautilus + - ceph osd set-require-min-compat-client nautilus - print: "**** done ceph" -- 2.47.3