qa: remove simplemessenger tests

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/msgr/random.yaml b/qa/msgr/random.yaml
deleted file mode 100644 (file)
index 383beea..0000000
--- a/qa/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/msgr/simple.yaml b/qa/msgr/simple.yaml
deleted file mode 100644 (file)
index a867965..0000000
--- a/qa/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/standalone/osd/osd-fast-mark-down.sh b/qa/standalone/osd/osd-fast-mark-down.sh
index cf5851c25ca8fb26d55497bc59c9cde21d1fd9ad..0ef9d8ce41b220e9ea0a6c40d14bf1605c73afed 100755 (executable)
--- a/qa/standalone/osd/osd-fast-mark-down.sh
+++ b/qa/standalone/osd/osd-fast-mark-down.sh
@@ -35,11 +35,6 @@ function run() {
     CEPH_ARGS=$OLD_ARGS"--osd-fast-fail-on-connection-refused=true "
     OLD_ARGS=$CEPH_ARGS
 
-    # force v1 addr here for simple's benefit
-    CEPH_ARGS+="--ms_type=simple --mon-host=v1:$CEPH_MON"
-    echo "Testing simple msgr..."
-    test_fast_kill $dir || return 1
-
     CEPH_ARGS=$OLD_ARGS"--ms_type=async --mon-host=$CEPH_MON"
     echo "Testing async msgr..."
     test_fast_kill $dir || return 1

diff --git a/qa/suites/rados/thrash-old-clients/msgr/random.yaml b/qa/suites/rados/thrash-old-clients/msgr/random.yaml
deleted file mode 120000 (symlink)
index e0dcb14..0000000
--- a/qa/suites/rados/thrash-old-clients/msgr/random.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/msgr/random.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-old-clients/msgr/simple.yaml b/qa/suites/rados/thrash-old-clients/msgr/simple.yaml
deleted file mode 120000 (symlink)
index 780dc0e..0000000
--- a/qa/suites/rados/thrash-old-clients/msgr/simple.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/msgr/simple.yaml
\ No newline at end of file