From cb7bb0c49315cc66130336625ede92c70beaec74 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 20 Feb 2017 11:44:49 +0100 Subject: [PATCH] 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 --- .../upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon | 1 - .../stress-split-erasure-code-x86_64/4-mon/mona.yaml | 6 ++++++ .../hammer-x/stress-split-erasure-code-x86_64/6-next-mon | 1 - .../stress-split-erasure-code-x86_64/6-next-mon/monb.yaml | 6 ++++++ 4 files changed, 12 insertions(+), 2 deletions(-) delete mode 120000 qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon create mode 100644 qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/4-mon/mona.yaml delete mode 120000 qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon create mode 100644 qa/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon/monb.yaml 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" -- 2.47.3