From 105ca218eee4c5eba960b495dac029030700fb5b Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 29 Nov 2018 14:35:01 +0800 Subject: [PATCH] qa/suites/rados/upgrade: set require-osd-release to nautilus * add qa/releases/nautilus.yaml so it can be reused. * use releases/nautilus.yaml in luminous-x upgrade test, so test_librbd_python.sh is able to use the feature introduced in nautilus. Fixes: http://tracker.ceph.com/issues/37432 Signed-off-by: Kefu Chai --- qa/releases/nautilus.yaml | 6 ++++++ qa/suites/rados/upgrade/luminous-x-singleton/7-mimic.yaml | 1 - .../rados/upgrade/luminous-x-singleton/7-nautilus.yaml | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 qa/releases/nautilus.yaml delete mode 120000 qa/suites/rados/upgrade/luminous-x-singleton/7-mimic.yaml create mode 120000 qa/suites/rados/upgrade/luminous-x-singleton/7-nautilus.yaml diff --git a/qa/releases/nautilus.yaml b/qa/releases/nautilus.yaml new file mode 100644 index 00000000000..5b79e5b70eb --- /dev/null +++ b/qa/releases/nautilus.yaml @@ -0,0 +1,6 @@ +tasks: +- exec: + osd.0: + - ceph osd require-osd-release nautilus + - ceph osd set-require-min-compat-client nautilus +- ceph.healthy: diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/7-mimic.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/7-mimic.yaml deleted file mode 120000 index 70b9ff00f7a..00000000000 --- a/qa/suites/rados/upgrade/luminous-x-singleton/7-mimic.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/releases/mimic.yaml \ No newline at end of file diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/7-nautilus.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/7-nautilus.yaml new file mode 120000 index 00000000000..9e99b7d2829 --- /dev/null +++ b/qa/suites/rados/upgrade/luminous-x-singleton/7-nautilus.yaml @@ -0,0 +1 @@ +.qa/releases/nautilus.yaml \ No newline at end of file -- 2.39.5