qa/suites/upgrade/mimic-x: fix msgr2 vs octopus ordering

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

diff --git a/qa/suites/upgrade/mimic-x/stress-split/6-msgr2.yaml b/qa/suites/upgrade/mimic-x/stress-split/6-msgr2.yaml
deleted file mode 100644 (file)
index ad3858e..0000000
--- a/qa/suites/upgrade/mimic-x/stress-split/6-msgr2.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- exec:
-    mon.a:
-      - ceph mon enable-msgr2
-- ceph.healthy:

diff --git a/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/+ b/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/.qa b/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rbd-python.yaml b/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rbd-python.yaml
deleted file mode 100644 (file)
index a1a3d9e..0000000
--- a/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rbd-python.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-meta:
-- desc: |
-   librbd python api tests
-tasks:
-- workunit:
-    branch: mimic
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh
-- print: "**** done rbd/test_librbd_python.sh 9-workload"

diff --git a/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/snaps-many-objects.yaml b/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/snaps-many-objects.yaml
deleted file mode 100644 (file)
index 805bf97..0000000
--- a/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/snaps-many-objects.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool with snapshot operations
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    write_append_excl: false
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50

diff --git a/qa/suites/upgrade/mimic-x/stress-split/7-msgr2.yaml b/qa/suites/upgrade/mimic-x/stress-split/7-msgr2.yaml
new file mode 100644 (file)
index 0000000..ad3858e
--- /dev/null
+++ b/qa/suites/upgrade/mimic-x/stress-split/7-msgr2.yaml
@@ -0,0 +1,5 @@
+tasks:
+- exec:
+    mon.a:
+      - ceph mon enable-msgr2
+- ceph.healthy:

diff --git a/qa/suites/upgrade/mimic-x/stress-split/8-final-workload/+ b/qa/suites/upgrade/mimic-x/stress-split/8-final-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/upgrade/mimic-x/stress-split/8-final-workload/.qa b/qa/suites/upgrade/mimic-x/stress-split/8-final-workload/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/upgrade/mimic-x/stress-split/8-final-workload/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/mimic-x/stress-split/8-final-workload/rbd-python.yaml b/qa/suites/upgrade/mimic-x/stress-split/8-final-workload/rbd-python.yaml
new file mode 100644 (file)
index 0000000..a1a3d9e
--- /dev/null
+++ b/qa/suites/upgrade/mimic-x/stress-split/8-final-workload/rbd-python.yaml
@@ -0,0 +1,10 @@
+meta:
+- desc: |
+   librbd python api tests
+tasks:
+- workunit:
+    branch: mimic
+    clients:
+      client.0:
+        - rbd/test_librbd_python.sh
+- print: "**** done rbd/test_librbd_python.sh 9-workload"

diff --git a/qa/suites/upgrade/mimic-x/stress-split/8-final-workload/snaps-many-objects.yaml b/qa/suites/upgrade/mimic-x/stress-split/8-final-workload/snaps-many-objects.yaml
new file mode 100644 (file)
index 0000000..805bf97
--- /dev/null
+++ b/qa/suites/upgrade/mimic-x/stress-split/8-final-workload/snaps-many-objects.yaml
@@ -0,0 +1,16 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool with snapshot operations
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    write_append_excl: false
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50