From 40c6319a551cc4b9ffd0c4fbb9e3e7f30a5967bc Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 1 Apr 2019 16:35:59 -0700 Subject: [PATCH] qa: test featureful client with mimic base Fixes: http://tracker.ceph.com/issues/39020 Signed-off-by: Patrick Donnelly --- .../old_client/tasks/{0-luminous.yaml => 0-mimic.yaml} | 10 +++++----- .../featureful_client/old_client/tasks/1-client.yaml | 2 +- .../old_client/tasks/3-compat_client/mimic.yaml | 2 +- .../tasks/{0-luminous.yaml => 0-mimic.yaml} | 10 +++++----- .../upgraded_client/tasks/1-client.yaml | 2 +- .../upgraded_client/tasks/4-compat_client.yaml | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) rename qa/suites/fs/upgrade/featureful_client/old_client/tasks/{0-luminous.yaml => 0-mimic.yaml} (79%) rename qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/{0-luminous.yaml => 0-mimic.yaml} (79%) diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-luminous.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml similarity index 79% rename from qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-luminous.yaml rename to qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml index 7835cbf93b3bd..f9323cc1fb6da 100644 --- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-luminous.yaml +++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/luminous latest + install ceph/mimic latest tasks: - install: - branch: luminous + branch: mimic exclude_packages: - librados3 - ceph-mgr-dashboard @@ -12,7 +12,7 @@ tasks: - ceph-mgr-rook - ceph-mgr-ssh extra_packages: ['librados2'] -- print: "**** done installing luminous" +- print: "**** done installing mimic" - ceph: mon_bind_addrvec: false mon_bind_msgr2: false @@ -36,6 +36,6 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd require-osd-release luminous - - ceph osd set-require-min-compat-client luminous + - ceph osd require-osd-release mimic + - ceph osd set-require-min-compat-client mimic - 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 88d686fab12ee..3baa9c21846f8 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 luminous client" +- print: "**** done mimic 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/mimic.yaml index 367206766d8b2..c5737ae1f4577 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/mimic.yaml @@ -6,5 +6,5 @@ tasks: - exec: mon.a: - ceph fs dump --format=json-pretty - - ceph fs set cephfs min_compat_client mimic + - ceph fs set cephfs min_compat_client nautilus - fs.clients_evicted: diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-luminous.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml similarity index 79% rename from qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-luminous.yaml rename to qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml index 7835cbf93b3bd..f9323cc1fb6da 100644 --- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-luminous.yaml +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml @@ -1,9 +1,9 @@ meta: - desc: | - install ceph/luminous latest + install ceph/mimic latest tasks: - install: - branch: luminous + branch: mimic exclude_packages: - librados3 - ceph-mgr-dashboard @@ -12,7 +12,7 @@ tasks: - ceph-mgr-rook - ceph-mgr-ssh extra_packages: ['librados2'] -- print: "**** done installing luminous" +- print: "**** done installing mimic" - ceph: mon_bind_addrvec: false mon_bind_msgr2: false @@ -36,6 +36,6 @@ tasks: ms bind msgr2: false - exec: osd.0: - - ceph osd require-osd-release luminous - - ceph osd set-require-min-compat-client luminous + - ceph osd require-osd-release mimic + - ceph osd set-require-min-compat-client mimic - 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 dc1c0d8d1efcd..3196e358842b4 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 luminous client" +- print: "**** done mimic client" #- workunit: # clients: # all: diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/4-compat_client.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/4-compat_client.yaml index bdf484da64996..78809e4fed477 100644 --- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/4-compat_client.yaml +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/4-compat_client.yaml @@ -6,7 +6,7 @@ tasks: - exec: mon.a: - ceph fs dump --format=json-pretty - - ceph fs set cephfs min_compat_client mimic + - ceph fs set cephfs min_compat_client nautilus - fs.clients_evicted: clients: client.0: False -- 2.39.5