]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: reduce stress-split-erasure-code-x86_64 dependency on stress-split 13533/head
authorNathan Cutler <ncutler@suse.com>
Mon, 20 Feb 2017 10:44:49 +0000 (11:44 +0100)
committerNathan Cutler <ncutler@suse.com>
Mon, 20 Feb 2017 10:48:58 +0000 (11:48 +0100)
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>
qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon [deleted symlink]
qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon/mona.yaml [new file with mode: 0644]
qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon [deleted symlink]
qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon/monb.yaml [new file with mode: 0644]

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 (symlink)
index 0ea7dd5..0000000
+++ /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 (file)
index 0000000..7c75c10
--- /dev/null
@@ -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 (symlink)
index 0f00e43..0000000
+++ /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 (file)
index 0000000..22e87c7
--- /dev/null
@@ -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"