From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 20 Feb 2017 10:44:49 +0000 (+0100)
Subject: tests: reduce stress-split-erasure-code-x86_64 dependency on stress-split
X-Git-Tag: v10.2.6~19^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F13533%2Fhead;p=ceph.git

tests: reduce stress-split-erasure-code-x86_64 dependency on stress-split

This patch breaks the symlinks for two files from stress-split that
are being changed by https://github.com/ceph/ceph/pull/13222 in a way
that would break this test otherwise.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon b/qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon
deleted file mode 120000
index 0ea7dd5aa8d5..000000000000
--- a/qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/4-mon
\ No newline at end of file
diff --git a/qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon/mona.yaml b/qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon/mona.yaml
new file mode 100644
index 000000000000..7c75c102fc4f
--- /dev/null
+++ b/qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon/mona.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph.restart:
+    daemons: [mon.a]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- print: "**** done ceph.restart mon.a"
diff --git a/qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon b/qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon
deleted file mode 120000
index 0f00e43e5fd6..000000000000
--- a/qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/6-next-mon
\ No newline at end of file
diff --git a/qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon/monb.yaml b/qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon/monb.yaml
new file mode 100644
index 000000000000..22e87c7ad21d
--- /dev/null
+++ b/qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon/monb.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph.restart:
+    daemons: [mon.b]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- print: "**** done ceph.restart mon.b 6-next-mon"