From: Kefu Chai <kchai@redhat.com>
Date: Thu, 29 Nov 2018 06:35:01 +0000 (+0800)
Subject: qa/suites/rados/upgrade: set require-osd-release to nautilus
X-Git-Tag: v14.1.0~763^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25314%2Fhead;p=ceph.git

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 <kchai@redhat.com>
---

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