From: Neha Ojha <nojha@redhat.com>
Date: Tue, 28 Jul 2020 21:08:27 +0000 (-0700)
Subject: qa/*/nautilus-p2p-stress-split: rework objectstore backends
X-Git-Tag: v14.2.11~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F36353%2Fhead;p=ceph.git

qa/*/nautilus-p2p-stress-split: rework objectstore backends

Earlier we were symlinking to qa/objectstore, which causes older versions of
nautilus to fail when trying to use hybrid allocator.

Fixes: https://tracker.ceph.com/issues/46731
Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/.qa b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore
deleted file mode 120000
index 58b9a18c28e..00000000000
--- a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore
+++ /dev/null
@@ -1 +0,0 @@
-../../../../objectstore
\ No newline at end of file
diff --git a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/.qa b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/bluestore-bitmap.yaml b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/bluestore-bitmap.yaml
new file mode 120000
index 00000000000..a59cf517506
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/bluestore-bitmap.yaml
@@ -0,0 +1 @@
+.qa/objectstore/bluestore-bitmap.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/default.yaml b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/default.yaml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/filestore-xfs.yaml b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/filestore-xfs.yaml
new file mode 120000
index 00000000000..41f2a9d14db
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/filestore-xfs.yaml
@@ -0,0 +1 @@
+.qa/objectstore/filestore-xfs.yaml
\ No newline at end of file