From: Sage Weil Date: Mon, 31 Dec 2018 21:39:15 +0000 (-0600) Subject: qa/msgr: move msgr factet into generic re-usable dir X-Git-Tag: v14.1.0~484^2~9 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d518eb6cace3df637ba13ce102501cdf552c22de;p=ceph.git qa/msgr: move msgr factet into generic re-usable dir Signed-off-by: Sage Weil --- diff --git a/qa/msgr/async-v2only.yaml b/qa/msgr/async-v2only.yaml new file mode 100644 index 000000000000..4de9f32ac311 --- /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/msgr/async.yaml b/qa/msgr/async.yaml new file mode 100644 index 000000000000..9f93cab4f7e8 --- /dev/null +++ b/qa/msgr/async.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + global: + ms type: async diff --git a/qa/msgr/random.yaml b/qa/msgr/random.yaml new file mode 100644 index 000000000000..383beea73e64 --- /dev/null +++ b/qa/msgr/random.yaml @@ -0,0 +1,7 @@ +overrides: + ceph: + mon_bind_msgr2: false + conf: + global: + ms type: random + ms bind msgr2: false diff --git a/qa/msgr/simple.yaml b/qa/msgr/simple.yaml new file mode 100644 index 000000000000..a8679652c57c --- /dev/null +++ b/qa/msgr/simple.yaml @@ -0,0 +1,7 @@ +overrides: + ceph: + mon_bind_msgr2: false + conf: + global: + ms type: simple + ms bind msgr2: false diff --git a/qa/suites/rados/basic/msgr b/qa/suites/rados/basic/msgr new file mode 120000 index 000000000000..57bee80db00a --- /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 a602a0353e75..000000000000 --- 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/basic/msgr/async.yaml b/qa/suites/rados/basic/msgr/async.yaml deleted file mode 100644 index 9f93cab4f7e8..000000000000 --- a/qa/suites/rados/basic/msgr/async.yaml +++ /dev/null @@ -1,5 +0,0 @@ -overrides: - ceph: - conf: - global: - ms type: async diff --git a/qa/suites/rados/basic/msgr/random.yaml b/qa/suites/rados/basic/msgr/random.yaml deleted file mode 100644 index 383beea73e64..000000000000 --- a/qa/suites/rados/basic/msgr/random.yaml +++ /dev/null @@ -1,7 +0,0 @@ -overrides: - ceph: - mon_bind_msgr2: false - conf: - global: - ms type: random - ms bind msgr2: false diff --git a/qa/suites/rados/basic/msgr/simple.yaml b/qa/suites/rados/basic/msgr/simple.yaml deleted file mode 100644 index a8679652c57c..000000000000 --- a/qa/suites/rados/basic/msgr/simple.yaml +++ /dev/null @@ -1,7 +0,0 @@ -overrides: - ceph: - mon_bind_msgr2: false - conf: - global: - ms type: simple - ms bind msgr2: false diff --git a/qa/suites/rados/monthrash/msgr b/qa/suites/rados/monthrash/msgr index b29ecddaed7e..57bee80db00a 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 b29ecddaed7e..57bee80db00a 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 b29ecddaed7e..57bee80db00a 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 b29ecddaed7e..57bee80db00a 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 b29ecddaed7e..57bee80db00a 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 b29ecddaed7e..57bee80db00a 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 b29ecddaed7e..57bee80db00a 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