qa/suites/rados/upgrade: jewel-x -> luminous-x

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

diff --git a/qa/releases/mimic.yaml b/qa/releases/mimic.yaml
new file mode 100644 (file)
index 0000000..f901e7e
--- /dev/null
+++ b/qa/releases/mimic.yaml
@@ -0,0 +1,6 @@
+tasks:
+- exec:
+    osd.0:
+      - ceph osd require-osd-release mimic
+      - ceph osd set-require-min-compat-client mimic
+- ceph.healthy:

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/% b/qa/suites/rados/upgrade/jewel-x-singleton/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/+ b/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/openstack.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/openstack.yaml
deleted file mode 100644 (file)
index a0d5c20..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/openstack.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-openstack:
-  - machine:
-      disk: 100 # GB
-  - volumes: # attached to each instance
-      count: 3
-      size: 30 # GB

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/start.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/start.yaml
deleted file mode 100644 (file)
index 2872225..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/0-cluster/start.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-meta:
-- desc: |
-   Run ceph on two nodes,
-   with a separate client-only node. 
-   Use xfs beneath the osds.
-overrides:
-  ceph:
-    conf:
-      mon:
-        mon warn on legacy crush tunables: false
-    fs: xfs
-roles:
-- - mon.a
-  - mon.b
-  - mon.c
-  - mgr.x
-  - mgr.y
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - osd.3
-  - osd.4
-  - osd.5
-- - client.0

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml
deleted file mode 100644 (file)
index 31ca3e5..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-meta:
-- desc: install ceph/jewel latest
-tasks:
-- install:
-    branch: jewel
-    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
-- print: "**** done install jewel"
-- ceph:
-    skip_mgr_daemons: true
-    add_osds_to_crush: true
-    log-whitelist:
-      - required past_interval bounds are empty
-- print: "**** done ceph"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml
deleted file mode 100644 (file)
index c244916..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-meta:
-- desc: |
-   install upgrade ceph/-x on one node only
-   1st half
-   restart : osd.0,1,2,3,4,5
-tasks:
-- install.upgrade:
-    osd.0: 
-- print: "**** done install.upgrade osd.0"
-- ceph.restart:
-    daemons: [mon.a, mon.b, mon.c]
-    wait-for-healthy: false
-- ceph.restart:
-    daemons: [osd.0, osd.1, osd.2]
-    wait-for-healthy: false
-- print: "**** done ceph.restart 1st half"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml
deleted file mode 100644 (file)
index ecf3d1b..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-meta:
-- desc: |
-   randomly kill and revive osd
-   small chance to increase the number of pgs
-overrides:
-  ceph:
-    log-whitelist:
-    - but it is still running
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- parallel:
-    - split_tasks
-split_tasks:
-  sequential:
-    - thrashosds:
-        timeout: 1200
-        chance_pgnum_grow: 1
-        chance_pgpnum_fix: 1
-        chance_thrash_cluster_full: 0
-        chance_thrash_pg_upmap: 0
-        chance_thrash_pg_upmap_items: 0
-        chance_force_recovery: 0
-    - print: "**** done thrashosds 3-thrash"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/+ b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-cls.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-cls.yaml
deleted file mode 100644 (file)
index e35bfc2..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-cls.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   run basic cls tests for rbd
-split_tasks:
-  sequential:
-  - workunit:
-      branch: jewel
-      clients:
-        client.0:
-          - cls/test_cls_rbd.sh
-  - print: "**** done cls/test_cls_rbd.sh 5-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-import-export.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-import-export.yaml
deleted file mode 100644 (file)
index 9d6c2e2..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-import-export.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-meta:
-- desc: |
-   run basic import/export cli tests for rbd
-split_tasks:
-  sequential:
-  - workunit:
-      branch: jewel
-      clients:
-        client.0:
-          - rbd/import_export.sh
-      env:
-        RBD_CREATE_ARGS: --new-format
-  - print: "**** done rbd/import_export.sh 5-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/readwrite.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/readwrite.yaml
deleted file mode 100644 (file)
index 0382520..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/readwrite.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool, 
-   using only reads, writes, and deletes
-split_tasks:
-  sequential:
-  - full_sequential:
-    - rados:
-        clients: [client.0]
-        ops: 4000
-        objects: 500
-        write_append_excl: false
-        op_weights:
-          read: 45
-          write: 45
-          delete: 10
-  - print: "**** done rados/readwrite 5-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/snaps-few-objects.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index c96cfbe..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/snaps-few-objects.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool with snapshot operations
-split_tasks:
-  sequential:
-  - full_sequential:
-    - rados:
-        clients: [client.0]
-        ops: 4000
-        objects: 50
-        write_append_excl: false
-        op_weights:
-          read: 100
-          write: 100
-          delete: 50
-          snap_create: 50
-          snap_remove: 50
-          rollback: 50
-  - print: "**** done rados/snaps-few-objects 5-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/+ b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/radosbench.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/radosbench.yaml
deleted file mode 100644 (file)
index 2cfbf1d..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/radosbench.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-meta:
-- desc: |
-   run randomized correctness test for rados operations
-   generate write load with rados bench
-split_tasks:
-  sequential:
-  - full_sequential:
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-  - print: "**** done radosbench 7-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd_api.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd_api.yaml
deleted file mode 100644 (file)
index 22a5f57..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd_api.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   librbd C and C++ api tests
-split_tasks:
-  sequential:
-  - workunit:
-      branch: jewel
-      clients:
-        client.0:
-           - rbd/test_librbd.sh
-  - print: "**** done rbd/test_librbd.sh 7-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml
deleted file mode 100644 (file)
index a110815..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-meta:
-- desc: |
-    install upgrade on remaining node
-    restartin remaining osds
-overrides:
-  ceph:
-    log-whitelist:
-      - overall HEALTH_
-      - \(FS_DEGRADED\)
-      - \(MDS_
-tasks:
-- install.upgrade:
-    osd.3:
-- ceph.restart:
-    daemons: [osd.3, osd.4, osd.5]
-    wait-for-up: true
-    wait-for-healthy: false
-- ceph.restart:
-    daemons: [mds.a]
-    wait-for-up: true
-    wait-for-healthy: false
-- install.upgrade:
-    client.0:

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-luminous.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/7-luminous.yaml
deleted file mode 120000 (symlink)
index 5283ac7..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/7-luminous.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../releases/luminous.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/+ b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml
deleted file mode 100644 (file)
index 56ba21d..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: |
-   librbd python api tests
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh
-- print: "**** done rbd/test_librbd_python.sh 9-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml
deleted file mode 100644 (file)
index e41f47a..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   swift api tests for rgw
-tasks:
-- rgw: 
-    client.0:
-- print: "**** done rgw 9-workload"
-- swift:
-    client.0:
-      rgw_server: client.0
-- print: "**** done swift 9-workload"

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/snaps-many-objects.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/snaps-many-objects.yaml
deleted file mode 100644 (file)
index 805bf97..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/8-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/rados/upgrade/jewel-x-singleton/thrashosds-health.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/thrashosds-health.yaml
deleted file mode 120000 (symlink)
index e0426db..0000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/thrashosds-health.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/% b/qa/suites/rados/upgrade/luminous-x-singleton/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/+ b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/openstack.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/openstack.yaml
new file mode 100644 (file)
index 0000000..a0d5c20
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/openstack.yaml
@@ -0,0 +1,6 @@
+openstack:
+  - machine:
+      disk: 100 # GB
+  - volumes: # attached to each instance
+      count: 3
+      size: 30 # GB

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..0d378dc
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml
@@ -0,0 +1,22 @@
+meta:
+- desc: |
+   Run ceph on two nodes,
+   with a separate client-only node.
+   Use xfs beneath the osds.
+overrides:
+  ceph:
+    fs: xfs
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - mgr.x
+  - mgr.y
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+- - osd.3
+  - osd.4
+  - osd.5
+- - client.0

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml
new file mode 100644 (file)
index 0000000..a296ad7
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml
@@ -0,0 +1,8 @@
+meta:
+- desc: install ceph/luminous latest
+tasks:
+- install:
+    branch: luminous
+- print: "**** done install luminous"
+- ceph:
+- print: "**** done ceph"

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/firsthalf.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/firsthalf.yaml
new file mode 100644 (file)
index 0000000..466a920
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/firsthalf.yaml
@@ -0,0 +1,16 @@
+meta:
+- desc: |
+   install upgrade ceph/-x on one node only
+   1st half
+   restart : osd.0,1,2,3,4,5
+tasks:
+- install.upgrade:
+    osd.0:
+- print: "**** done install.upgrade osd.0"
+- ceph.restart:
+    daemons: [mon.a, mon.b, mon.c]
+    wait-for-healthy: false
+- ceph.restart:
+    daemons: [osd.0, osd.1, osd.2]
+    wait-for-healthy: false
+- print: "**** done ceph.restart 1st half"

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml
new file mode 100644 (file)
index 0000000..c70aa7b
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml
@@ -0,0 +1,20 @@
+meta:
+- desc: |
+   randomly kill and revive osd
+   small chance to increase the number of pgs
+overrides:
+  ceph:
+    log-whitelist:
+    - but it is still running
+    - objects unfound and apparently lost
+    - log bound mismatch
+tasks:
+- parallel:
+    - split_tasks
+split_tasks:
+  sequential:
+    - thrashosds:
+        timeout: 1200
+        chance_pgnum_grow: 1
+        chance_pgpnum_fix: 1
+    - print: "**** done thrashosds 3-thrash"

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/+ b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-cls.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-cls.yaml
new file mode 100644 (file)
index 0000000..1a1d5e6
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-cls.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   run basic cls tests for rbd
+split_tasks:
+  sequential:
+  - workunit:
+      branch: luminous
+      clients:
+        client.0:
+          - cls/test_cls_rbd.sh
+  - print: "**** done cls/test_cls_rbd.sh 5-workload"

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-import-export.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-import-export.yaml
new file mode 100644 (file)
index 0000000..da92668
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/rbd-import-export.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: |
+   run basic import/export cli tests for rbd
+split_tasks:
+  sequential:
+  - workunit:
+      branch: luminous
+      clients:
+        client.0:
+          - rbd/import_export.sh
+      env:
+        RBD_CREATE_ARGS: --new-format
+  - print: "**** done rbd/import_export.sh 5-workload"

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/readwrite.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..8833d4d
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/readwrite.yaml
@@ -0,0 +1,17 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool,
+   using only reads, writes, and deletes
+split_tasks:
+  sequential:
+  - full_sequential:
+    - rados:
+        clients: [client.0]
+        ops: 4000
+        objects: 500
+        write_append_excl: false
+        op_weights:
+          read: 45
+          write: 45
+          delete: 10
+  - print: "**** done rados/readwrite 5-workload"

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/snaps-few-objects.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..c96cfbe
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/snaps-few-objects.yaml
@@ -0,0 +1,19 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool with snapshot operations
+split_tasks:
+  sequential:
+  - full_sequential:
+    - rados:
+        clients: [client.0]
+        ops: 4000
+        objects: 50
+        write_append_excl: false
+        op_weights:
+          read: 100
+          write: 100
+          delete: 50
+          snap_create: 50
+          snap_remove: 50
+          rollback: 50
+  - print: "**** done rados/snaps-few-objects 5-workload"

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/+ b/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/radosbench.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/radosbench.yaml
new file mode 100644 (file)
index 0000000..2cfbf1d
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/radosbench.yaml
@@ -0,0 +1,41 @@
+meta:
+- desc: |
+   run randomized correctness test for rados operations
+   generate write load with rados bench
+split_tasks:
+  sequential:
+  - full_sequential:
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+  - print: "**** done radosbench 7-workload"

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/rbd_api.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/rbd_api.yaml
new file mode 100644 (file)
index 0000000..3a9452a
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/rbd_api.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   librbd C and C++ api tests
+split_tasks:
+  sequential:
+  - workunit:
+      branch: luminous
+      clients:
+        client.0:
+           - rbd/test_librbd.sh
+  - print: "**** done rbd/test_librbd.sh 7-workload"

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml
new file mode 100644 (file)
index 0000000..a110815
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml
@@ -0,0 +1,23 @@
+meta:
+- desc: |
+    install upgrade on remaining node
+    restartin remaining osds
+overrides:
+  ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - \(FS_DEGRADED\)
+      - \(MDS_
+tasks:
+- install.upgrade:
+    osd.3:
+- ceph.restart:
+    daemons: [osd.3, osd.4, osd.5]
+    wait-for-up: true
+    wait-for-healthy: false
+- ceph.restart:
+    daemons: [mds.a]
+    wait-for-up: true
+    wait-for-healthy: false
+- install.upgrade:
+    client.0:

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/7-mimic.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/7-mimic.yaml
new file mode 120000 (symlink)
index 0000000..52e4a5e
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/7-mimic.yaml
@@ -0,0 +1 @@
+../../../../releases/mimic.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/+ b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/+
new file mode 100644 (file)
index 0000000..e69de29

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

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml
new file mode 100644 (file)
index 0000000..76e5d6f
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   swift api tests for rgw
+tasks:
+- rgw:
+    client.0:
+- print: "**** done rgw 9-workload"
+- swift:
+    client.0:
+      rgw_server: client.0
+- print: "**** done swift 9-workload"

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/snaps-many-objects.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/snaps-many-objects.yaml
new file mode 100644 (file)
index 0000000..805bf97
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/8-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

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/thrashosds-health.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..e0426db
--- /dev/null
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/thrashosds-health.yaml
@@ -0,0 +1 @@
+../../../../tasks/thrashosds-health.yaml
\ No newline at end of file