From 9a3ffe734cf57dd312bc7129c6c4030bf8149e07 Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Tue, 28 Jul 2020 14:08:27 -0700 Subject: [PATCH] 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 --- qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/.qa | 1 + .../upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore | 1 - .../nautilus-p2p/nautilus-p2p-stress-split/objectstore/.qa | 1 + .../nautilus-p2p-stress-split/objectstore/bluestore-bitmap.yaml | 1 + .../nautilus-p2p-stress-split/objectstore/default.yaml | 0 .../nautilus-p2p-stress-split/objectstore/filestore-xfs.yaml | 1 + 6 files changed, 4 insertions(+), 1 deletion(-) create mode 120000 qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/.qa delete mode 120000 qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore create mode 120000 qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/.qa create mode 120000 qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/bluestore-bitmap.yaml create mode 100644 qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/default.yaml create mode 120000 qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/objectstore/filestore-xfs.yaml 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 0000000000000..a602a0353e751 --- /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 58b9a18c28eff..0000000000000 --- 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 0000000000000..a602a0353e751 --- /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 0000000000000..a59cf5175069a --- /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 0000000000000..e69de29bb2d1d 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 0000000000000..41f2a9d14db8e --- /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 -- 2.47.3