From d518eb6cace3df637ba13ce102501cdf552c22de Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 31 Dec 2018 15:39:15 -0600 Subject: [PATCH] qa/msgr: move msgr factet into generic re-usable dir Signed-off-by: Sage Weil --- qa/msgr/async-v2only.yaml | 7 +++++++ qa/{suites/rados/basic => }/msgr/async.yaml | 0 qa/{suites/rados/basic => }/msgr/random.yaml | 0 qa/{suites/rados/basic => }/msgr/simple.yaml | 0 qa/suites/rados/basic/msgr | 1 + qa/suites/rados/basic/msgr/.qa | 1 - qa/suites/rados/monthrash/msgr | 2 +- qa/suites/rados/multimon/msgr | 2 +- qa/suites/rados/singleton-bluestore/msgr | 2 +- qa/suites/rados/singleton/msgr | 2 +- qa/suites/rados/thrash-old-clients/msgr | 2 +- qa/suites/rados/thrash/msgr | 2 +- qa/suites/rados/verify/msgr | 2 +- 13 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 qa/msgr/async-v2only.yaml rename qa/{suites/rados/basic => }/msgr/async.yaml (100%) rename qa/{suites/rados/basic => }/msgr/random.yaml (100%) rename qa/{suites/rados/basic => }/msgr/simple.yaml (100%) create mode 120000 qa/suites/rados/basic/msgr delete mode 120000 qa/suites/rados/basic/msgr/.qa diff --git a/qa/msgr/async-v2only.yaml b/qa/msgr/async-v2only.yaml new file mode 100644 index 00000000000..4de9f32ac31 --- /dev/null +++ b/qa/msgr/async-v2only.yaml @@ -0,0 +1,7 @@ +overrides: + ceph: + conf: + global: + ms type: async + ms bind msgr2: true + ms bind msgr1: false diff --git a/qa/suites/rados/basic/msgr/async.yaml b/qa/msgr/async.yaml similarity index 100% rename from qa/suites/rados/basic/msgr/async.yaml rename to qa/msgr/async.yaml diff --git a/qa/suites/rados/basic/msgr/random.yaml b/qa/msgr/random.yaml similarity index 100% rename from qa/suites/rados/basic/msgr/random.yaml rename to qa/msgr/random.yaml diff --git a/qa/suites/rados/basic/msgr/simple.yaml b/qa/msgr/simple.yaml similarity index 100% rename from qa/suites/rados/basic/msgr/simple.yaml rename to qa/msgr/simple.yaml diff --git a/qa/suites/rados/basic/msgr b/qa/suites/rados/basic/msgr new file mode 120000 index 00000000000..57bee80db00 --- /dev/null +++ b/qa/suites/rados/basic/msgr @@ -0,0 +1 @@ +.qa/msgr \ No newline at end of file diff --git a/qa/suites/rados/basic/msgr/.qa b/qa/suites/rados/basic/msgr/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/rados/basic/msgr/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/rados/monthrash/msgr b/qa/suites/rados/monthrash/msgr index b29ecddaed7..57bee80db00 120000 --- a/qa/suites/rados/monthrash/msgr +++ b/qa/suites/rados/monthrash/msgr @@ -1 +1 @@ -../basic/msgr \ No newline at end of file +.qa/msgr \ No newline at end of file diff --git a/qa/suites/rados/multimon/msgr b/qa/suites/rados/multimon/msgr index b29ecddaed7..57bee80db00 120000 --- a/qa/suites/rados/multimon/msgr +++ b/qa/suites/rados/multimon/msgr @@ -1 +1 @@ -../basic/msgr \ No newline at end of file +.qa/msgr \ No newline at end of file diff --git a/qa/suites/rados/singleton-bluestore/msgr b/qa/suites/rados/singleton-bluestore/msgr index b29ecddaed7..57bee80db00 120000 --- a/qa/suites/rados/singleton-bluestore/msgr +++ b/qa/suites/rados/singleton-bluestore/msgr @@ -1 +1 @@ -../basic/msgr \ No newline at end of file +.qa/msgr \ No newline at end of file diff --git a/qa/suites/rados/singleton/msgr b/qa/suites/rados/singleton/msgr index b29ecddaed7..57bee80db00 120000 --- a/qa/suites/rados/singleton/msgr +++ b/qa/suites/rados/singleton/msgr @@ -1 +1 @@ -../basic/msgr \ No newline at end of file +.qa/msgr \ No newline at end of file diff --git a/qa/suites/rados/thrash-old-clients/msgr b/qa/suites/rados/thrash-old-clients/msgr index b29ecddaed7..57bee80db00 120000 --- a/qa/suites/rados/thrash-old-clients/msgr +++ b/qa/suites/rados/thrash-old-clients/msgr @@ -1 +1 @@ -../basic/msgr \ No newline at end of file +.qa/msgr \ No newline at end of file diff --git a/qa/suites/rados/thrash/msgr b/qa/suites/rados/thrash/msgr index b29ecddaed7..57bee80db00 120000 --- a/qa/suites/rados/thrash/msgr +++ b/qa/suites/rados/thrash/msgr @@ -1 +1 @@ -../basic/msgr \ No newline at end of file +.qa/msgr \ No newline at end of file diff --git a/qa/suites/rados/verify/msgr b/qa/suites/rados/verify/msgr index b29ecddaed7..57bee80db00 120000 --- a/qa/suites/rados/verify/msgr +++ b/qa/suites/rados/verify/msgr @@ -1 +1 @@ -../basic/msgr \ No newline at end of file +.qa/msgr \ No newline at end of file -- 2.47.3