From: Sage Weil <sage@redhat.com>
Date: Tue, 21 Jan 2020 18:43:19 +0000 (-0600)
Subject: qa/suites/upgrade/nautilus-x/stress-split: fix msgr2 vs octopus ordering
X-Git-Tag: v15.1.0~57^2~11
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2adadc2356ad03c8ac62944245e080a6bb4fb980;p=ceph-ci.git

qa/suites/upgrade/nautilus-x/stress-split: fix msgr2 vs octopus ordering

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

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/6-msgr2.yaml b/qa/suites/upgrade/nautilus-x/stress-split/6-msgr2.yaml
deleted file mode 100644
index f56c8be0894..00000000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/6-msgr2.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- exec:
-    mon.a:
-      - ceph mon enable-msgr2
-      - ceph config rm global mon_warn_on_msgr2_not_enabled
-- ceph.healthy:
diff --git a/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/+ b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/.qa b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split/7-final-workload/rbd-python.yaml b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rbd-python.yaml
deleted file mode 100644
index f2cf947b338..00000000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rbd-python.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-meta:
-- desc: |
-   librbd python api tests
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default clone format: 1
-tasks:
-- workunit:
-    branch: nautilus
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh
-- print: "**** done rbd/test_librbd_python.sh 9-workload"
diff --git a/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/snaps-many-objects.yaml b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/snaps-many-objects.yaml
deleted file mode 100644
index 805bf97c379..00000000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split/7-msgr2.yaml b/qa/suites/upgrade/nautilus-x/stress-split/7-msgr2.yaml
new file mode 100644
index 00000000000..f56c8be0894
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/7-msgr2.yaml
@@ -0,0 +1,6 @@
+tasks:
+- exec:
+    mon.a:
+      - ceph mon enable-msgr2
+      - ceph config rm global mon_warn_on_msgr2_not_enabled
+- ceph.healthy:
diff --git a/qa/suites/upgrade/nautilus-x/stress-split/8-final-workload/+ b/qa/suites/upgrade/nautilus-x/stress-split/8-final-workload/+
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/upgrade/nautilus-x/stress-split/8-final-workload/.qa b/qa/suites/upgrade/nautilus-x/stress-split/8-final-workload/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/8-final-workload/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade/nautilus-x/stress-split/8-final-workload/rbd-python.yaml b/qa/suites/upgrade/nautilus-x/stress-split/8-final-workload/rbd-python.yaml
new file mode 100644
index 00000000000..f2cf947b338
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/8-final-workload/rbd-python.yaml
@@ -0,0 +1,15 @@
+meta:
+- desc: |
+   librbd python api tests
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default clone format: 1
+tasks:
+- workunit:
+    branch: nautilus
+    clients:
+      client.0:
+        - rbd/test_librbd_python.sh
+- print: "**** done rbd/test_librbd_python.sh 9-workload"
diff --git a/qa/suites/upgrade/nautilus-x/stress-split/8-final-workload/snaps-many-objects.yaml b/qa/suites/upgrade/nautilus-x/stress-split/8-final-workload/snaps-many-objects.yaml
new file mode 100644
index 00000000000..805bf97c379
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-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