qa/suites: do not test luminous-x upgrade path

in this change,

* suites/rados/upgrade: luminous-x-singleton => mimic-x-singleton
* suites/upgrade: luminous-x => nautilus-x

we support upgrade from n to n+2 release. otherwise monitor refuses to
do so:

mon.a@-1(probing) e1 current monmap has min_mon_release 15 (luminous)
which is >2 releases older than me 15 (octopus), stopping.

Fixes: https://tracker.ceph.com/issues/38845
Signed-off-by: Kefu Chai <kchai@redhat.com>

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

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

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

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

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
deleted file mode 100644 (file)
index a0d5c20..0000000
--- a/qa/suites/rados/upgrade/luminous-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/luminous-x-singleton/0-cluster/start.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml
deleted file mode 100644 (file)
index 3c65ea9..0000000
--- a/qa/suites/rados/upgrade/luminous-x-singleton/0-cluster/start.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-meta:
-- desc: |
-   Run ceph on two nodes,
-   with a separate client-only node.
-   Use xfs beneath the osds.
-overrides:
-  ceph:
-    mon_bind_addrvec: false
-    mon_bind_msgr2: false
-    fs: xfs
-    conf:
-      global:
-        ms dump corrupt message level: 0
-        ms bind msgr2: false
-      mds:
-        debug ms: 1
-        debug mds: 20
-roles:
-- - mon.a
-  - mgr.x
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-  - osd.3
-- - mon.b
-  - osd.4
-  - osd.5
-  - osd.6
-  - osd.7
-- - mon.c
-  - mgr.y
-  - osd.8
-  - osd.9
-  - osd.10
-  - osd.11
-- - client.0

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

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
deleted file mode 100644 (file)
index ed61af0..0000000
--- a/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-      - \(MON_DOWN\)
-      - \(MGR_DOWN\)
-      - slow request
-meta:
-- desc: install ceph/luminous latest
-tasks:
-- install:
-    branch: luminous
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-diskprediction-cloud
-      - ceph-mgr-rook
-      - ceph-mgr-ssh
-    extra_packages: ['librados2']
-- print: "**** done install luminous"
-- ceph:
-- print: "**** done ceph"

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

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
deleted file mode 100644 (file)
index a6cf4a4..0000000
--- a/qa/suites/rados/upgrade/luminous-x-singleton/2-partial-upgrade/firsthalf.yaml
+++ /dev/null
@@ -1,18 +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:
-    mon.a:
-    mon.b:
-- print: "**** done install.upgrade osd.0"
-- ceph.restart:
-    daemons: [mon.a, mon.b]
-    wait-for-healthy: false
-    mon-health-to-clog: false
-- ceph.restart:
-    daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, osd.6, osd.7]
-    wait-for-healthy: false
-- print: "**** done ceph.restart 1st 2/3s"

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

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
deleted file mode 100644 (file)
index e36882d..0000000
--- a/qa/suites/rados/upgrade/luminous-x-singleton/3-thrash/default.yaml
+++ /dev/null
@@ -1,22 +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:
-        disable_objectstore_tool_tests: true
-        timeout: 1200
-        chance_pgnum_grow: 1
-        chance_pgpnum_fix: 1
-        aggressive_pg_num_changes: false
-    - 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/+
deleted file mode 100644 (file)
index e69de29..0000000

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

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
deleted file mode 100644 (file)
index 1a1d5e6..0000000
--- a/qa/suites/rados/upgrade/luminous-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: 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
deleted file mode 100644 (file)
index da92668..0000000
--- a/qa/suites/rados/upgrade/luminous-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: 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
deleted file mode 100644 (file)
index 8833d4d..0000000
--- a/qa/suites/rados/upgrade/luminous-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/luminous-x-singleton/4-workload/snaps-few-objects.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/4-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index c96cfbe..0000000
--- a/qa/suites/rados/upgrade/luminous-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/luminous-x-singleton/5-workload/+ b/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

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

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
deleted file mode 100644 (file)
index 2cfbf1d..0000000
--- a/qa/suites/rados/upgrade/luminous-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/luminous-x-singleton/5-workload/rbd_api.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/5-workload/rbd_api.yaml
deleted file mode 100644 (file)
index 3a9452a..0000000
--- a/qa/suites/rados/upgrade/luminous-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: 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
deleted file mode 100644 (file)
index e7fa4b2..0000000
--- a/qa/suites/rados/upgrade/luminous-x-singleton/6-finish-upgrade.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-meta:
-- desc: |
-    install upgrade on remaining node
-    restartin remaining osds
-overrides:
-  ceph:
-    log-whitelist:
-      - overall HEALTH_
-      - \(FS_DEGRADED\)
-      - \(MDS_
-tasks:
-- install.upgrade:
-    mon.c:
-- ceph.restart:
-    daemons: [mon.c, mgr.x, mgr.y]
-    wait-for-up: true
-    wait-for-healthy: false
-- ceph.restart:
-    daemons: [osd.8, osd.9, osd.10, osd.11]
-    wait-for-up: true
-    wait-for-healthy: false
-- ceph.restart:
-    daemons: [mds.a]
-    wait-for-up: true
-    wait-for-healthy: false
-- exec:
-    mon.a:
-      - ceph mon enable-msgr2
-- install.upgrade:
-    client.0:

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/7-nautilus.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/7-nautilus.yaml
deleted file mode 120000 (symlink)
index 9e99b7d..0000000
--- a/qa/suites/rados/upgrade/luminous-x-singleton/7-nautilus.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/releases/nautilus.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/+
deleted file mode 100644 (file)
index e69de29..0000000

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

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
deleted file mode 100644 (file)
index 56ba21d..0000000
--- a/qa/suites/rados/upgrade/luminous-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/luminous-x-singleton/8-workload/rgw-swift.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml
deleted file mode 100644 (file)
index 76e5d6f..0000000
--- a/qa/suites/rados/upgrade/luminous-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/luminous-x-singleton/8-workload/snaps-many-objects.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/snaps-many-objects.yaml
deleted file mode 100644 (file)
index 805bf97..0000000
--- a/qa/suites/rados/upgrade/luminous-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/luminous-x-singleton/supported-random-distro$ b/qa/suites/rados/upgrade/luminous-x-singleton/supported-random-distro$
deleted file mode 120000 (symlink)
index 0862b44..0000000
--- a/qa/suites/rados/upgrade/luminous-x-singleton/supported-random-distro$
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-random-distro$
\ No newline at end of file

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

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

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

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

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

diff --git a/qa/suites/rados/upgrade/mimic-x-singleton/0-cluster/openstack.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/0-cluster/openstack.yaml
new file mode 100644 (file)
index 0000000..a0d5c20
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-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/mimic-x-singleton/0-cluster/start.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..3c65ea9
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-x-singleton/0-cluster/start.yaml
@@ -0,0 +1,37 @@
+meta:
+- desc: |
+   Run ceph on two nodes,
+   with a separate client-only node.
+   Use xfs beneath the osds.
+overrides:
+  ceph:
+    mon_bind_addrvec: false
+    mon_bind_msgr2: false
+    fs: xfs
+    conf:
+      global:
+        ms dump corrupt message level: 0
+        ms bind msgr2: false
+      mds:
+        debug ms: 1
+        debug mds: 20
+roles:
+- - mon.a
+  - mgr.x
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+- - mon.b
+  - osd.4
+  - osd.5
+  - osd.6
+  - osd.7
+- - mon.c
+  - mgr.y
+  - osd.8
+  - osd.9
+  - osd.10
+  - osd.11
+- - client.0

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

diff --git a/qa/suites/rados/upgrade/mimic-x-singleton/1-install/mimic.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/1-install/mimic.yaml
new file mode 100644 (file)
index 0000000..0a33885
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-x-singleton/1-install/mimic.yaml
@@ -0,0 +1,22 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - \(MON_DOWN\)
+      - \(MGR_DOWN\)
+      - slow request
+meta:
+- desc: install ceph/mimic latest
+tasks:
+- install:
+    branch: mimic
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
+      - ceph-mgr-ssh
+    extra_packages: ['librados2']
+- print: "**** done install luminous"
+- ceph:
+- print: "**** done ceph"

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

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

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

diff --git a/qa/suites/rados/upgrade/mimic-x-singleton/3-thrash/default.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/3-thrash/default.yaml
new file mode 100644 (file)
index 0000000..e36882d
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-x-singleton/3-thrash/default.yaml
@@ -0,0 +1,22 @@
+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:
+        disable_objectstore_tool_tests: true
+        timeout: 1200
+        chance_pgnum_grow: 1
+        chance_pgpnum_fix: 1
+        aggressive_pg_num_changes: false
+    - print: "**** done thrashosds 3-thrash"

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

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

diff --git a/qa/suites/rados/upgrade/mimic-x-singleton/4-workload/rbd-cls.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/4-workload/rbd-cls.yaml
new file mode 100644 (file)
index 0000000..1a1d5e6
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-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/mimic-x-singleton/4-workload/rbd-import-export.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/4-workload/rbd-import-export.yaml
new file mode 100644 (file)
index 0000000..da92668
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-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/mimic-x-singleton/4-workload/readwrite.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/4-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..8833d4d
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-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/mimic-x-singleton/4-workload/snaps-few-objects.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/4-workload/snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..c96cfbe
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-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/mimic-x-singleton/5-workload/+ b/qa/suites/rados/upgrade/mimic-x-singleton/5-workload/+
new file mode 100644 (file)
index 0000000..e69de29

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

diff --git a/qa/suites/rados/upgrade/mimic-x-singleton/5-workload/radosbench.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/5-workload/radosbench.yaml
new file mode 100644 (file)
index 0000000..2cfbf1d
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-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/mimic-x-singleton/5-workload/rbd_api.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/5-workload/rbd_api.yaml
new file mode 100644 (file)
index 0000000..3a9452a
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-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/mimic-x-singleton/6-finish-upgrade.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/6-finish-upgrade.yaml
new file mode 100644 (file)
index 0000000..e7fa4b2
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-x-singleton/6-finish-upgrade.yaml
@@ -0,0 +1,30 @@
+meta:
+- desc: |
+    install upgrade on remaining node
+    restartin remaining osds
+overrides:
+  ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - \(FS_DEGRADED\)
+      - \(MDS_
+tasks:
+- install.upgrade:
+    mon.c:
+- ceph.restart:
+    daemons: [mon.c, mgr.x, mgr.y]
+    wait-for-up: true
+    wait-for-healthy: false
+- ceph.restart:
+    daemons: [osd.8, osd.9, osd.10, osd.11]
+    wait-for-up: true
+    wait-for-healthy: false
+- ceph.restart:
+    daemons: [mds.a]
+    wait-for-up: true
+    wait-for-healthy: false
+- exec:
+    mon.a:
+      - ceph mon enable-msgr2
+- install.upgrade:
+    client.0:

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

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

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

diff --git a/qa/suites/rados/upgrade/mimic-x-singleton/8-workload/rbd-python.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/8-workload/rbd-python.yaml
new file mode 100644 (file)
index 0000000..56ba21d
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-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/mimic-x-singleton/8-workload/rgw-swift.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/8-workload/rgw-swift.yaml
new file mode 100644 (file)
index 0000000..76e5d6f
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-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/mimic-x-singleton/8-workload/snaps-many-objects.yaml b/qa/suites/rados/upgrade/mimic-x-singleton/8-workload/snaps-many-objects.yaml
new file mode 100644 (file)
index 0000000..805bf97
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-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/mimic-x-singleton/supported-random-distro$ b/qa/suites/rados/upgrade/mimic-x-singleton/supported-random-distro$
new file mode 120000 (symlink)
index 0000000..0862b44
--- /dev/null
+++ b/qa/suites/rados/upgrade/mimic-x-singleton/supported-random-distro$
@@ -0,0 +1 @@
+.qa/distros/supported-random-distro$
\ No newline at end of file

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

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

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

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

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

diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/.qa b/qa/suites/upgrade/luminous-x/parallel/0-cluster/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/0-cluster/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/openstack.yaml b/qa/suites/upgrade/luminous-x/parallel/0-cluster/openstack.yaml
deleted file mode 100644 (file)
index f4d1349..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/0-cluster/openstack.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-openstack:
-  - volumes: # attached to each instance
-      count: 3
-      size: 30 # GB

diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
deleted file mode 100644 (file)
index b86ddcd..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-meta:
-- desc: |
-   Run ceph on two nodes,
-   with a separate client 0,1,2 third node.
-   Use xfs beneath the osds.
-   CephFS tests running on client 2,3
-roles:
-- - mon.a
-  - mgr.x
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-  - osd.3
-- - mon.b
-  - osd.4
-  - osd.5
-  - osd.6
-  - osd.7
-- - mon.c
-  - osd.8
-  - osd.9
-  - osd.10
-  - osd.11
-- - client.0
-  - client.1
-  - client.2
-  - client.3
-overrides:
-  ceph:
-    mon_bind_msgr2: false
-    mon_bind_addrvec: false
-    log-whitelist:
-    - scrub mismatch
-    - ScrubResult
-    - wrongly marked
-    - \(POOL_APP_NOT_ENABLED\)
-    - \(SLOW_OPS\)
-    - overall HEALTH_
-    - slow request
-    - \(MON_MSGR2_NOT_ENABLED\)
-    conf:
-      global:
-        enable experimental unrecoverable data corrupting features: "*"
-      mon:
-        mon warn on osd down out interval zero: false
-      osd:
-        osd class load list: "*"
-        osd class default list: "*"
-    fs: xfs

diff --git a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/.qa b/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml b/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml
deleted file mode 100644 (file)
index 84dbc70..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-meta:
-- desc: |
-   install ceph/luminous latest
-   run workload and upgrade-sequence in parallel
-   upgrade the client node
-tasks:
-- install:
-    branch: luminous
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-diskprediction-cloud
-      - ceph-mgr-rook
-      - ceph-mgr-ssh
-    extra_packages: ['librados2']
-- print: "**** done installing luminous"
-- ceph:
-    log-whitelist:
-      - overall HEALTH_
-      - \(FS_
-      - \(MDS_
-      - \(OSD_
-      - \(MON_DOWN\)
-      - \(CACHE_POOL_
-      - \(POOL_
-      - \(MGR_DOWN\)
-      - \(PG_
-      - \(SMALLER_PGP_NUM\)
-      - Monitor daemon marked osd
-      - Behind on trimming
-      - Manager daemon
-    conf:
-      global:
-        mon warn on pool no app: false
-- exec:
-    osd.0:
-      - ceph osd require-osd-release luminous
-      - ceph osd set-require-min-compat-client luminous
-- print: "**** done ceph"
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:
-- print: "**** done install.upgrade non-client hosts"
-- parallel:
-    - workload
-    - upgrade-sequence
-- print: "**** done parallel"
-- install.upgrade:
-    client.0:
-- print: "**** done install.upgrade on client.0"

diff --git a/qa/suites/upgrade/luminous-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml b/qa/suites/upgrade/luminous-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/qa/suites/upgrade/luminous-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml b/qa/suites/upgrade/luminous-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml
deleted file mode 100644 (file)
index e31e37b..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd min pg log entries: 1
-        osd max pg log entries: 2

diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/+ b/qa/suites/upgrade/luminous-x/parallel/2-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

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

diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/blogbench.yaml b/qa/suites/upgrade/luminous-x/parallel/2-workload/blogbench.yaml
deleted file mode 100644 (file)
index 021fcc6..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/2-workload/blogbench.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-meta:
-- desc: |
-   run a cephfs stress test
-   mount ceph-fuse on client.2 before running workunit
-workload:
-  full_sequential:
-  - sequential:
-    - ceph-fuse:
-    - print: "**** done ceph-fuse 2-workload"
-    - workunit:
-        clients:
-           client.2:
-            - suites/blogbench.sh
-    - print: "**** done suites/blogbench.sh 2-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/ec-rados-default.yaml b/qa/suites/upgrade/luminous-x/parallel/2-workload/ec-rados-default.yaml
deleted file mode 100644 (file)
index 5c5a958..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/2-workload/ec-rados-default.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-meta:
-- desc: |
-   run run randomized correctness test for rados operations
-   on an erasure-coded pool
-workload:
-  full_sequential:
-  - rados:
-      clients: [client.0]
-      ops: 4000
-      objects: 50
-      ec_pool: true
-      write_append_excl: false
-      op_weights:
-        read: 100
-        write: 0
-        append: 100
-        delete: 50
-        snap_create: 50
-        snap_remove: 50
-        rollback: 50
-        copy_from: 50
-        setattr: 25
-        rmattr: 25
-  - print: "**** done rados ec task"

diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/rados_api.yaml b/qa/suites/upgrade/luminous-x/parallel/2-workload/rados_api.yaml
deleted file mode 100644 (file)
index e4cc9f9..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/2-workload/rados_api.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   object class functional tests
-workload:
-  full_sequential:
-    - workunit:
-        branch: luminous
-        clients:
-          client.0:
-            - cls
-    - print: "**** done cls 2-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/rados_loadgenbig.yaml b/qa/suites/upgrade/luminous-x/parallel/2-workload/rados_loadgenbig.yaml
deleted file mode 100644 (file)
index 874a8c5..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/2-workload/rados_loadgenbig.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   generate read/write load with rados objects ranging from 1MB to 25MB
-workload:
-  full_sequential:
-    - workunit:
-        branch: luminous
-        clients:
-          client.0:
-            - rados/load-gen-big.sh
-    - print: "**** done rados/load-gen-big.sh 2-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml
deleted file mode 100644 (file)
index ab68649..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-meta:
-- desc: |
-   rgw ragweed prepare
-workload:
-  full_sequential:
-  - sequential:
-    - rgw:
-      - client.1
-    - ragweed:
-        client.1:
-          default-branch: ceph-master
-          rgw_server: client.1
-          stages: prepare
-    - print: "**** done rgw ragweed prepare 2-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/test_rbd_api.yaml b/qa/suites/upgrade/luminous-x/parallel/2-workload/test_rbd_api.yaml
deleted file mode 100644 (file)
index 81563c9..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/2-workload/test_rbd_api.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   librbd C and C++ api tests
-workload:
-  full_sequential:
-    - workunit:
-        branch: luminous
-        clients:
-          client.0:
-            - rbd/test_librbd.sh
-    - print: "**** done rbd/test_librbd.sh 2-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/test_rbd_python.yaml b/qa/suites/upgrade/luminous-x/parallel/2-workload/test_rbd_python.yaml
deleted file mode 100644 (file)
index e17207d..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/2-workload/test_rbd_python.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   librbd python api tests
-workload:
-  full_sequential:
-    - workunit:
-        branch: luminous
-        clients:
-          client.0:
-            - rbd/test_librbd_python.sh
-    - print: "**** done rbd/test_librbd_python.sh 2-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/.qa b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml
deleted file mode 100644 (file)
index 7fb9829..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-meta:
-- desc: |
-   upgrade the ceph cluster
-upgrade-sequence:
-   sequential:
-   - ceph.restart:
-       daemons: [mon.a, mon.b, mon.c, mgr.x]
-       mon-health-to-clog: false
-       wait-for-healthy: false
-   - exec:
-       mon.a:
-         - ceph config set global mon_warn_on_msgr2_not_enabled false
-   - ceph.healthy:
-   - ceph.restart:
-       daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, osd.6, osd.7, osd.8, osd.9, osd.10, osd.11]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - ceph.restart:
-       daemons: [mds.a]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - print: "**** done ceph.restart all"

diff --git a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index 4f9aac7..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-meta:
-- desc: |
-   upgrade the ceph cluster,
-   upgrate in two steps
-   step one ordering: mon.a, osd.0, osd.1, mds.a
-   step two ordering: mon.b, mon.c, osd.2, osd.3
-   ceph expected to be healthy state after each step
-upgrade-sequence:
-   sequential:
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b, mgr.x]
-       wait-for-healthy: true
-       mon-health-to-clog: false
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.c]
-       wait-for-healthy: false
-       mon-health-to-clog: false
-   - exec:
-       mon.a:
-         - ceph config set global mon_warn_on_msgr2_not_enabled false
-   - ceph.healthy:
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.0, osd.1, osd.2, osd.3]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.4, osd.5, osd.6, osd.7]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.8, osd.9, osd.10, osd.11]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-msgr2.yaml b/qa/suites/upgrade/luminous-x/parallel/4-msgr2.yaml
deleted file mode 100644 (file)
index 60e3e20..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/4-msgr2.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- exec:
-    mon.a:
-      - ceph mon enable-msgr2
-      - ceph config rm global mon_warn_on_msgr2_not_enabled

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-nautilus.yaml b/qa/suites/upgrade/luminous-x/parallel/4-nautilus.yaml
deleted file mode 120000 (symlink)
index 9e99b7d..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/4-nautilus.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/releases/nautilus.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/+ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

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

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/blogbench.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/blogbench.yaml
deleted file mode 100644 (file)
index 205f72e..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/blogbench.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-meta:
-- desc: |
-   run a cephfs stress test
-   mount ceph-fuse on client.3 before running workunit
-tasks:
-- sequential:
-  - ceph-fuse:
-  - print: "**** done ceph-fuse 4-final-workload"
-  - workunit:
-      clients:
-         client.3:
-          - suites/blogbench.sh
-  - print: "**** done suites/blogbench.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados-snaps-few-objects.yaml
deleted file mode 100644 (file)
index d8b3dcb..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados-snaps-few-objects.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool with snapshots
-tasks:
-  - rados:
-      clients: [client.1]
-      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 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_loadgenmix.yaml
deleted file mode 100644 (file)
index 922a9da..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_loadgenmix.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: |
-   generate read/write load with rados objects ranging from 1 byte to 1MB
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - rados/load-gen-mix.sh
-  - print: "**** done rados/load-gen-mix.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_mon_thrash.yaml
deleted file mode 100644 (file)
index 129d138..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_mon_thrash.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-meta:
-- desc: |
-   librados C and C++ api tests
-overrides:
-  ceph:
-    log-whitelist:
-      - reached quota
-      - \(REQUEST_SLOW\)
-tasks:
-  - mon_thrash:
-      revive_delay: 20
-      thrash_delay: 1
-  - print: "**** done mon_thrash 4-final-workload"
-  - workunit:
-      clients:
-        client.1:
-          - rados/test.sh
-  - print: "**** done rados/test.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_cls.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_cls.yaml
deleted file mode 100644 (file)
index aaf0a37..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_cls.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: |
-   rbd object class functional tests
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - cls/test_cls_rbd.sh
-  - print: "**** done cls/test_cls_rbd.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml
deleted file mode 100644 (file)
index 46e1355..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   run basic import/export cli tests for rbd
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - rbd/import_export.sh
-      env:
-        RBD_CREATE_ARGS: --new-format
-  - print: "**** done rbd/import_export.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml
deleted file mode 100644 (file)
index 00855dc..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-overrides:
-  rgw:
-    frontend: civetweb
-tasks:
-  - sequential:
-    - rgw: [client.1]
-    - print: "**** done rgw 4-final-workload"
-    - rgw-final-workload

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml
deleted file mode 100644 (file)
index 7f31cac..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-    ragweed check for rgw
-rgw-final-workload:
-  full_sequential:
-  - ragweed:
-      client.1:
-        default-branch: ceph-master
-        rgw_server: client.1
-        stages: check
-  - print: "**** done ragweed check 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml
deleted file mode 100644 (file)
index 45c136f..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-meta:
-- desc: |
-   swift api tests for rgw
-rgw-final-workload:
-  full_sequential:
-  - swift:
-      client.1:
-        force-branch: ceph-master
-        rgw_server: client.1
-  - print: "**** done swift 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/objectstore b/qa/suites/upgrade/luminous-x/parallel/objectstore
deleted file mode 120000 (symlink)
index 016cbf9..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/objectstore
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/objectstore/
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/parallel/supported-all-distro b/qa/suites/upgrade/luminous-x/parallel/supported-all-distro
deleted file mode 120000 (symlink)
index ca82dde..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/supported-all-distro
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-all-distro
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/% b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/%
deleted file mode 100644 (file)
index e69de29..0000000

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

diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/0-cluster b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/0-cluster
deleted file mode 120000 (symlink)
index 3580937..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/0-cluster
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/0-cluster/
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/1-luminous-install b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/1-luminous-install
deleted file mode 120000 (symlink)
index 0479ac5..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/1-luminous-install
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/1-ceph-install/
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml
deleted file mode 100644 (file)
index e31e37b..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd min pg log entries: 1
-        osd max pg log entries: 2

diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/2-partial-upgrade b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/2-partial-upgrade
deleted file mode 120000 (symlink)
index ab35fc1..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/2-partial-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/2-partial-upgrade/
\ No newline at end of file

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

diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/3-thrash/default.yaml b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/3-thrash/default.yaml
deleted file mode 100644 (file)
index 8562545..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/3-thrash/default.yaml
+++ /dev/null
@@ -1,27 +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
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- parallel:
-  - stress-tasks
-stress-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-    min_in: 4
-    chance_thrash_cluster_full: 0
-    chance_thrash_pg_upmap: 0
-    chance_thrash_pg_upmap_items: 0
-    chance_force_recovery: 0
-    aggressive_pg_num_changes: false
-    disable_objectstore_tool_tests: true
-- print: "**** done thrashosds 3-thrash"

diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/4-ec-workload.yaml b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/4-ec-workload.yaml
deleted file mode 100644 (file)
index c89551e..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/4-ec-workload.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on an erasure coded pool
-stress-tasks:
-  - rados:
-      clients: [client.0]
-      ops: 4000
-      objects: 50
-      ec_pool: true
-      write_append_excl: false
-      op_weights:
-        read: 100
-        write: 0
-        append: 100
-        delete: 50
-        snap_create: 50
-        snap_remove: 50
-        rollback: 50
-        copy_from: 50
-        setattr: 25
-        rmattr: 25
-  - print: "**** done rados ec task"

diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/5-finish-upgrade.yaml b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/5-finish-upgrade.yaml
deleted file mode 120000 (symlink)
index a66a7dc..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/5-finish-upgrade.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/5-finish-upgrade.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/7-final-workload.yaml b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/7-final-workload.yaml
deleted file mode 100644 (file)
index 50a1465..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/7-final-workload.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# k=3 implies a stripe_width of 1376*3 = 4128 which is different from
-# the default value of 4096 It is also not a multiple of 1024*1024 and
-# creates situations where rounding rules during recovery becomes
-# necessary.
-#
-meta:
-- desc: |
-   randomized correctness test for rados operations on an erasure coded pool
-   using the jerasure plugin with k=3 and m=1
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 50
-    ec_pool: true
-    write_append_excl: false
-    erasure_code_profile:
-      name: jerasure31profile
-      plugin: jerasure
-      k: 3
-      m: 1
-      technique: reed_sol_van
-      crush-failure-domain: osd
-    op_weights:
-      read: 100
-      write: 0
-      append: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
-      copy_from: 50
-      setattr: 25
-      rmattr: 25

diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/objectstore b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/objectstore
deleted file mode 120000 (symlink)
index 016cbf9..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/objectstore
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/objectstore/
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/supported-all-distro b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/supported-all-distro
deleted file mode 120000 (symlink)
index ca82dde..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/supported-all-distro
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-all-distro
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/thrashosds-health.yaml b/qa/suites/upgrade/luminous-x/stress-split-erasure-code/thrashosds-health.yaml
deleted file mode 120000 (symlink)
index 9124eb1..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split-erasure-code/thrashosds-health.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/stress-split/% b/qa/suites/upgrade/luminous-x/stress-split/%
deleted file mode 100644 (file)
index e69de29..0000000

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

diff --git a/qa/suites/upgrade/luminous-x/stress-split/0-cluster/+ b/qa/suites/upgrade/luminous-x/stress-split/0-cluster/+
deleted file mode 100644 (file)
index e69de29..0000000

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

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

diff --git a/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml b/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml
deleted file mode 100644 (file)
index e2096de..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-meta:
-- desc: |
-   Run ceph on two nodes,
-   with a separate client-only node.
-   Use xfs beneath the osds.
-overrides:
-  ceph:
-    mon_bind_msgr2: false
-    mon_bind_addrvec: false
-    fs: xfs
-    log-whitelist:
-      - overall HEALTH_
-      - \(MON_DOWN\)
-      - \(MGR_DOWN\)
-      - slow request
-      - \(MON_MSGR2_NOT_ENABLED\)
-    conf:
-      global:
-        enable experimental unrecoverable data corrupting features: "*"
-        mon warn on msgr2 not enabled: false
-      mon:
-        mon warn on osd down out interval zero: false
-roles:
-- - mon.a
-  - mgr.x
-  - osd.0
-  - osd.1
-  - osd.2
-  - osd.3
-- - mon.b
-  - osd.4
-  - osd.5
-  - osd.6
-  - osd.7
-- - mon.c
-- - osd.8
-  - osd.9
-  - osd.10
-  - osd.11
-- - client.0

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

diff --git a/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml b/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml
deleted file mode 100644 (file)
index 65c4398..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-meta:
-- desc: install ceph/luminous latest
-tasks:
-- install:
-    branch: luminous
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-diskprediction-cloud
-      - ceph-mgr-rook
-      - ceph-mgr-ssh
-    extra_packages: ['librados2']
-- print: "**** done install luminous"
-- ceph:
-- exec:
-    osd.0:
-      - ceph osd require-osd-release luminous
-      - ceph osd set-require-min-compat-client luminous
-- print: "**** done ceph"
-overrides:
-  ceph:
-    conf:
-      mon:
-        mon warn on osd down out interval zero: false

diff --git a/qa/suites/upgrade/luminous-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml b/qa/suites/upgrade/luminous-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/qa/suites/upgrade/luminous-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml b/qa/suites/upgrade/luminous-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml
deleted file mode 100644 (file)
index e31e37b..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd min pg log entries: 1
-        osd max pg log entries: 2

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

diff --git a/qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml
deleted file mode 100644 (file)
index 58ff5ac..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-meta:
-- desc: |
-   install upgrade ceph/-x on 2/3 of cluster
-   restart : mons, osd.0-7
-tasks:
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:
-- print: "**** done install.upgrade of first 3 nodes"
-- ceph.restart:
-    daemons: [mon.a,mon.b,mgr.x,osd.0,osd.1,osd.2,osd.3,osd.4,osd.5,osd.6,osd.7]
-    mon-health-to-clog: false
-- print: "**** done ceph.restart of all mons and 2/3 of osds"

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

diff --git a/qa/suites/upgrade/luminous-x/stress-split/3-thrash/default.yaml b/qa/suites/upgrade/luminous-x/stress-split/3-thrash/default.yaml
deleted file mode 100644 (file)
index e0f317b..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/3-thrash/default.yaml
+++ /dev/null
@@ -1,26 +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
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- parallel:
-  - stress-tasks
-stress-tasks:
-- 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
-    disable_objectstore_tool_tests: true
-    chance_force_recovery: 0
-    aggressive_pg_num_changes: false
-- print: "**** done thrashosds 3-thrash"

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

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

diff --git a/qa/suites/upgrade/luminous-x/stress-split/4-workload/radosbench.yaml b/qa/suites/upgrade/luminous-x/stress-split/4-workload/radosbench.yaml
deleted file mode 100644 (file)
index 115939e..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/4-workload/radosbench.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-meta:
-- desc: |
-   run randomized correctness test for rados operations
-   generate write load with rados bench
-stress-tasks:
-- full_sequential:
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-  - radosbench:
-      clients: [client.0]
-      time: 90
-- print: "**** done radosbench 7-workload"

diff --git a/qa/suites/upgrade/luminous-x/stress-split/4-workload/rbd-cls.yaml b/qa/suites/upgrade/luminous-x/stress-split/4-workload/rbd-cls.yaml
deleted file mode 100644 (file)
index f8cc4d8..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/4-workload/rbd-cls.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-meta:
-- desc: |
-   run basic cls tests for rbd
-stress-tasks:
-- 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/upgrade/luminous-x/stress-split/4-workload/rbd-import-export.yaml b/qa/suites/upgrade/luminous-x/stress-split/4-workload/rbd-import-export.yaml
deleted file mode 100644 (file)
index 30a677a..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/4-workload/rbd-import-export.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: |
-   run basic import/export cli tests for rbd
-stress-tasks:
-- 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/upgrade/luminous-x/stress-split/4-workload/rbd_api.yaml b/qa/suites/upgrade/luminous-x/stress-split/4-workload/rbd_api.yaml
deleted file mode 100644 (file)
index 9079aa3..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/4-workload/rbd_api.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-meta:
-- desc: |
-   librbd C and C++ api tests
-stress-tasks:
-- workunit:
-     branch: luminous
-     clients:
-        client.0:
-           - rbd/test_librbd.sh
-- print: "**** done rbd/test_librbd.sh 7-workload"

diff --git a/qa/suites/upgrade/luminous-x/stress-split/4-workload/readwrite.yaml b/qa/suites/upgrade/luminous-x/stress-split/4-workload/readwrite.yaml
deleted file mode 100644 (file)
index 41e34d6..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/4-workload/readwrite.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool,
-   using only reads, writes, and deletes
-stress-tasks:
-- 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/upgrade/luminous-x/stress-split/4-workload/snaps-few-objects.yaml b/qa/suites/upgrade/luminous-x/stress-split/4-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index f56d0de..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/4-workload/snaps-few-objects.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool with snapshot operations
-stress-tasks:
-- 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/upgrade/luminous-x/stress-split/5-finish-upgrade.yaml b/qa/suites/upgrade/luminous-x/stress-split/5-finish-upgrade.yaml
deleted file mode 100644 (file)
index 306445c..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/5-finish-upgrade.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-tasks:
-- install.upgrade:
-    osd.8:
-    client.0:
-- ceph.restart:
-    daemons: [mon.c, osd.8, osd.9, osd.10, osd.11]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- exec:
-    osd.0:
-      - ceph osd set pglog_hardlimit
-      - ceph osd dump --format=json-pretty | grep "flags"
-      - ceph config set global mon_warn_on_msgr2_not_enabled false
-- print: "**** try to set pglog_hardlimit again, should succeed"
-

diff --git a/qa/suites/upgrade/luminous-x/stress-split/6-msgr2.yaml b/qa/suites/upgrade/luminous-x/stress-split/6-msgr2.yaml
deleted file mode 100644 (file)
index f56c8be..0000000
--- a/qa/suites/upgrade/luminous-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/luminous-x/stress-split/6-nautilus.yaml b/qa/suites/upgrade/luminous-x/stress-split/6-nautilus.yaml
deleted file mode 120000 (symlink)
index 9e99b7d..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/6-nautilus.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/releases/nautilus.yaml
\ No newline at end of file

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

diff --git a/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/.qa b/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/luminous-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/luminous-x/stress-split/7-final-workload/rbd-python.yaml b/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rbd-python.yaml
deleted file mode 100644 (file)
index ca512b4..0000000
--- a/qa/suites/upgrade/luminous-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: luminous
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh
-- print: "**** done rbd/test_librbd_python.sh 9-workload"

diff --git a/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rgw-swift.yaml
deleted file mode 100644 (file)
index 76e5d6f..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/7-final-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/upgrade/luminous-x/stress-split/7-final-workload/snaps-many-objects.yaml b/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/snaps-many-objects.yaml
deleted file mode 100644 (file)
index 805bf97..0000000
--- a/qa/suites/upgrade/luminous-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/luminous-x/stress-split/objectstore/.qa b/qa/suites/upgrade/luminous-x/stress-split/objectstore/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/objectstore/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/stress-split/objectstore/bluestore-bitmap.yaml b/qa/suites/upgrade/luminous-x/stress-split/objectstore/bluestore-bitmap.yaml
deleted file mode 120000 (symlink)
index a59cf51..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/objectstore/bluestore-bitmap.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/objectstore/bluestore-bitmap.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/stress-split/objectstore/filestore-xfs.yaml b/qa/suites/upgrade/luminous-x/stress-split/objectstore/filestore-xfs.yaml
deleted file mode 120000 (symlink)
index 41f2a9d..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/objectstore/filestore-xfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/objectstore/filestore-xfs.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/stress-split/supported-all-distro b/qa/suites/upgrade/luminous-x/stress-split/supported-all-distro
deleted file mode 120000 (symlink)
index ca82dde..0000000
--- a/qa/suites/upgrade/luminous-x/stress-split/supported-all-distro
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-all-distro
\ No newline at end of file

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

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

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

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

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

diff --git a/qa/suites/upgrade/nautilus-x/parallel/0-cluster/.qa b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/parallel/0-cluster/openstack.yaml b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/openstack.yaml
new file mode 100644 (file)
index 0000000..f4d1349
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/openstack.yaml
@@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 30 # GB

diff --git a/qa/suites/upgrade/nautilus-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..b86ddcd
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/start.yaml
@@ -0,0 +1,50 @@
+meta:
+- desc: |
+   Run ceph on two nodes,
+   with a separate client 0,1,2 third node.
+   Use xfs beneath the osds.
+   CephFS tests running on client 2,3
+roles:
+- - mon.a
+  - mgr.x
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+- - mon.b
+  - osd.4
+  - osd.5
+  - osd.6
+  - osd.7
+- - mon.c
+  - osd.8
+  - osd.9
+  - osd.10
+  - osd.11
+- - client.0
+  - client.1
+  - client.2
+  - client.3
+overrides:
+  ceph:
+    mon_bind_msgr2: false
+    mon_bind_addrvec: false
+    log-whitelist:
+    - scrub mismatch
+    - ScrubResult
+    - wrongly marked
+    - \(POOL_APP_NOT_ENABLED\)
+    - \(SLOW_OPS\)
+    - overall HEALTH_
+    - slow request
+    - \(MON_MSGR2_NOT_ENABLED\)
+    conf:
+      global:
+        enable experimental unrecoverable data corrupting features: "*"
+      mon:
+        mon warn on osd down out interval zero: false
+      osd:
+        osd class load list: "*"
+        osd class default list: "*"
+    fs: xfs

diff --git a/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/.qa b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml
new file mode 100644 (file)
index 0000000..091b17f
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml
@@ -0,0 +1,44 @@
+meta:
+- desc: |
+   install ceph/luminous latest
+   run workload and upgrade-sequence in parallel
+   upgrade the client node
+tasks:
+- install:
+    branch: nautilus
+- print: "**** done installing nautilus"
+- ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - \(FS_
+      - \(MDS_
+      - \(OSD_
+      - \(MON_DOWN\)
+      - \(CACHE_POOL_
+      - \(POOL_
+      - \(MGR_DOWN\)
+      - \(PG_
+      - \(SMALLER_PGP_NUM\)
+      - Monitor daemon marked osd
+      - Behind on trimming
+      - Manager daemon
+    conf:
+      global:
+        mon warn on pool no app: false
+- exec:
+    osd.0:
+      - ceph osd require-osd-release nautilus
+      - ceph osd set-require-min-compat-client nautilus
+- print: "**** done ceph"
+- install.upgrade:
+    mon.a:
+    mon.b:
+    mon.c:
+- print: "**** done install.upgrade non-client hosts"
+- parallel:
+    - workload
+    - upgrade-sequence
+- print: "**** done parallel"
+- install.upgrade:
+    client.0:
+- print: "**** done install.upgrade on client.0"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml b/qa/suites/upgrade/nautilus-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml
@@ -0,0 +1 @@
+

diff --git a/qa/suites/upgrade/nautilus-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml b/qa/suites/upgrade/nautilus-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml
new file mode 100644 (file)
index 0000000..e31e37b
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd min pg log entries: 1
+        osd max pg log entries: 2

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/+ b/qa/suites/upgrade/nautilus-x/parallel/2-workload/+
new file mode 100644 (file)
index 0000000..e69de29

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

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/blogbench.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..021fcc6
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/2-workload/blogbench.yaml
@@ -0,0 +1,14 @@
+meta:
+- desc: |
+   run a cephfs stress test
+   mount ceph-fuse on client.2 before running workunit
+workload:
+  full_sequential:
+  - sequential:
+    - ceph-fuse:
+    - print: "**** done ceph-fuse 2-workload"
+    - workunit:
+        clients:
+           client.2:
+            - suites/blogbench.sh
+    - print: "**** done suites/blogbench.sh 2-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/ec-rados-default.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/ec-rados-default.yaml
new file mode 100644 (file)
index 0000000..5c5a958
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/2-workload/ec-rados-default.yaml
@@ -0,0 +1,24 @@
+meta:
+- desc: |
+   run run randomized correctness test for rados operations
+   on an erasure-coded pool
+workload:
+  full_sequential:
+  - rados:
+      clients: [client.0]
+      ops: 4000
+      objects: 50
+      ec_pool: true
+      write_append_excl: false
+      op_weights:
+        read: 100
+        write: 0
+        append: 100
+        delete: 50
+        snap_create: 50
+        snap_remove: 50
+        rollback: 50
+        copy_from: 50
+        setattr: 25
+        rmattr: 25
+  - print: "**** done rados ec task"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_api.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_api.yaml
new file mode 100644 (file)
index 0000000..e4cc9f9
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_api.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   object class functional tests
+workload:
+  full_sequential:
+    - workunit:
+        branch: luminous
+        clients:
+          client.0:
+            - cls
+    - print: "**** done cls 2-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_loadgenbig.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_loadgenbig.yaml
new file mode 100644 (file)
index 0000000..874a8c5
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_loadgenbig.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   generate read/write load with rados objects ranging from 1MB to 25MB
+workload:
+  full_sequential:
+    - workunit:
+        branch: luminous
+        clients:
+          client.0:
+            - rados/load-gen-big.sh
+    - print: "**** done rados/load-gen-big.sh 2-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml
new file mode 100644 (file)
index 0000000..ab68649
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml
@@ -0,0 +1,14 @@
+meta:
+- desc: |
+   rgw ragweed prepare
+workload:
+  full_sequential:
+  - sequential:
+    - rgw:
+      - client.1
+    - ragweed:
+        client.1:
+          default-branch: ceph-master
+          rgw_server: client.1
+          stages: prepare
+    - print: "**** done rgw ragweed prepare 2-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_api.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_api.yaml
new file mode 100644 (file)
index 0000000..81563c9
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_api.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   librbd C and C++ api tests
+workload:
+  full_sequential:
+    - workunit:
+        branch: luminous
+        clients:
+          client.0:
+            - rbd/test_librbd.sh
+    - print: "**** done rbd/test_librbd.sh 2-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_python.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_python.yaml
new file mode 100644 (file)
index 0000000..e17207d
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_python.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   librbd python api tests
+workload:
+  full_sequential:
+    - workunit:
+        branch: luminous
+        clients:
+          client.0:
+            - rbd/test_librbd_python.sh
+    - print: "**** done rbd/test_librbd_python.sh 2-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/.qa b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml
new file mode 100644 (file)
index 0000000..7fb9829
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -0,0 +1,22 @@
+meta:
+- desc: |
+   upgrade the ceph cluster
+upgrade-sequence:
+   sequential:
+   - ceph.restart:
+       daemons: [mon.a, mon.b, mon.c, mgr.x]
+       mon-health-to-clog: false
+       wait-for-healthy: false
+   - exec:
+       mon.a:
+         - ceph config set global mon_warn_on_msgr2_not_enabled false
+   - ceph.healthy:
+   - ceph.restart:
+       daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, osd.6, osd.7, osd.8, osd.9, osd.10, osd.11]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - ceph.restart:
+       daemons: [mds.a]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - print: "**** done ceph.restart all"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..4f9aac7
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -0,0 +1,50 @@
+meta:
+- desc: |
+   upgrade the ceph cluster,
+   upgrate in two steps
+   step one ordering: mon.a, osd.0, osd.1, mds.a
+   step two ordering: mon.b, mon.c, osd.2, osd.3
+   ceph expected to be healthy state after each step
+upgrade-sequence:
+   sequential:
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.b, mgr.x]
+       wait-for-healthy: true
+       mon-health-to-clog: false
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.c]
+       wait-for-healthy: false
+       mon-health-to-clog: false
+   - exec:
+       mon.a:
+         - ceph config set global mon_warn_on_msgr2_not_enabled false
+   - ceph.healthy:
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [osd.0, osd.1, osd.2, osd.3]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [osd.4, osd.5, osd.6, osd.7]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [osd.8, osd.9, osd.10, osd.11]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60

diff --git a/qa/suites/upgrade/nautilus-x/parallel/4-msgr2.yaml b/qa/suites/upgrade/nautilus-x/parallel/4-msgr2.yaml
new file mode 100644 (file)
index 0000000..60e3e20
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/4-msgr2.yaml
@@ -0,0 +1,5 @@
+tasks:
+- exec:
+    mon.a:
+      - ceph mon enable-msgr2
+      - ceph config rm global mon_warn_on_msgr2_not_enabled

diff --git a/qa/suites/upgrade/nautilus-x/parallel/4-nautilus.yaml b/qa/suites/upgrade/nautilus-x/parallel/4-nautilus.yaml
new file mode 120000 (symlink)
index 0000000..9e99b7d
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/4-nautilus.yaml
@@ -0,0 +1 @@
+.qa/releases/nautilus.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/+ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/+
new file mode 100644 (file)
index 0000000..e69de29

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

diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/blogbench.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..205f72e
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/blogbench.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: |
+   run a cephfs stress test
+   mount ceph-fuse on client.3 before running workunit
+tasks:
+- sequential:
+  - ceph-fuse:
+  - print: "**** done ceph-fuse 4-final-workload"
+  - workunit:
+      clients:
+         client.3:
+          - suites/blogbench.sh
+  - print: "**** done suites/blogbench.sh 4-final-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados-snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..d8b3dcb
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados-snaps-few-objects.yaml
@@ -0,0 +1,17 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool with snapshots
+tasks:
+  - rados:
+      clients: [client.1]
+      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 4-final-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados_loadgenmix.yaml
new file mode 100644 (file)
index 0000000..922a9da
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados_loadgenmix.yaml
@@ -0,0 +1,9 @@
+meta:
+- desc: |
+   generate read/write load with rados objects ranging from 1 byte to 1MB
+tasks:
+  - workunit:
+      clients:
+        client.1:
+          - rados/load-gen-mix.sh
+  - print: "**** done rados/load-gen-mix.sh 4-final-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados_mon_thrash.yaml
new file mode 100644 (file)
index 0000000..129d138
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados_mon_thrash.yaml
@@ -0,0 +1,18 @@
+meta:
+- desc: |
+   librados C and C++ api tests
+overrides:
+  ceph:
+    log-whitelist:
+      - reached quota
+      - \(REQUEST_SLOW\)
+tasks:
+  - mon_thrash:
+      revive_delay: 20
+      thrash_delay: 1
+  - print: "**** done mon_thrash 4-final-workload"
+  - workunit:
+      clients:
+        client.1:
+          - rados/test.sh
+  - print: "**** done rados/test.sh 4-final-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rbd_cls.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rbd_cls.yaml
new file mode 100644 (file)
index 0000000..aaf0a37
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rbd_cls.yaml
@@ -0,0 +1,9 @@
+meta:
+- desc: |
+   rbd object class functional tests
+tasks:
+  - workunit:
+      clients:
+        client.1:
+          - cls/test_cls_rbd.sh
+  - print: "**** done cls/test_cls_rbd.sh 4-final-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rbd_import_export.yaml
new file mode 100644 (file)
index 0000000..46e1355
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rbd_import_export.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   run basic import/export cli tests for rbd
+tasks:
+  - workunit:
+      clients:
+        client.1:
+          - rbd/import_export.sh
+      env:
+        RBD_CREATE_ARGS: --new-format
+  - print: "**** done rbd/import_export.sh 4-final-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml
new file mode 100644 (file)
index 0000000..00855dc
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml
@@ -0,0 +1,8 @@
+overrides:
+  rgw:
+    frontend: civetweb
+tasks:
+  - sequential:
+    - rgw: [client.1]
+    - print: "**** done rgw 4-final-workload"
+    - rgw-final-workload

diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_ragweed_check.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_ragweed_check.yaml
new file mode 100644 (file)
index 0000000..7f31cac
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_ragweed_check.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+    ragweed check for rgw
+rgw-final-workload:
+  full_sequential:
+  - ragweed:
+      client.1:
+        default-branch: ceph-master
+        rgw_server: client.1
+        stages: check
+  - print: "**** done ragweed check 4-final-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_swift.yaml
new file mode 100644 (file)
index 0000000..45c136f
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_swift.yaml
@@ -0,0 +1,10 @@
+meta:
+- desc: |
+   swift api tests for rgw
+rgw-final-workload:
+  full_sequential:
+  - swift:
+      client.1:
+        force-branch: ceph-master
+        rgw_server: client.1
+  - print: "**** done swift 4-final-workload"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/objectstore b/qa/suites/upgrade/nautilus-x/parallel/objectstore
new file mode 120000 (symlink)
index 0000000..016cbf9
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/objectstore
@@ -0,0 +1 @@
+../stress-split/objectstore/
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/parallel/supported-all-distro b/qa/suites/upgrade/nautilus-x/parallel/supported-all-distro
new file mode 120000 (symlink)
index 0000000..ca82dde
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/supported-all-distro
@@ -0,0 +1 @@
+.qa/distros/supported-all-distro
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/% b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/%
new file mode 100644 (file)
index 0000000..e69de29

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

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/0-cluster b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/0-cluster
new file mode 120000 (symlink)
index 0000000..3580937
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/0-cluster
@@ -0,0 +1 @@
+../stress-split/0-cluster/
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1-nautilus-install b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1-nautilus-install
new file mode 120000 (symlink)
index 0000000..0479ac5
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1-nautilus-install
@@ -0,0 +1 @@
+../stress-split/1-ceph-install/
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml
@@ -0,0 +1 @@
+

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml
new file mode 100644 (file)
index 0000000..e31e37b
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd min pg log entries: 1
+        osd max pg log entries: 2

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/2-partial-upgrade b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/2-partial-upgrade
new file mode 120000 (symlink)
index 0000000..ab35fc1
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/2-partial-upgrade
@@ -0,0 +1 @@
+../stress-split/2-partial-upgrade/
\ No newline at end of file

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

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/3-thrash/default.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/3-thrash/default.yaml
new file mode 100644 (file)
index 0000000..8562545
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/3-thrash/default.yaml
@@ -0,0 +1,27 @@
+meta:
+- desc: |
+   randomly kill and revive osd
+   small chance to increase the number of pgs
+overrides:
+  ceph:
+    log-whitelist:
+    - but it is still running
+    - wrongly marked me down
+    - objects unfound and apparently lost
+    - log bound mismatch
+tasks:
+- parallel:
+  - stress-tasks
+stress-tasks:
+- thrashosds:
+    timeout: 1200
+    chance_pgnum_grow: 1
+    chance_pgpnum_fix: 1
+    min_in: 4
+    chance_thrash_cluster_full: 0
+    chance_thrash_pg_upmap: 0
+    chance_thrash_pg_upmap_items: 0
+    chance_force_recovery: 0
+    aggressive_pg_num_changes: false
+    disable_objectstore_tool_tests: true
+- print: "**** done thrashosds 3-thrash"

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/4-ec-workload.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/4-ec-workload.yaml
new file mode 100644 (file)
index 0000000..c89551e
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/4-ec-workload.yaml
@@ -0,0 +1,22 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on an erasure coded pool
+stress-tasks:
+  - rados:
+      clients: [client.0]
+      ops: 4000
+      objects: 50
+      ec_pool: true
+      write_append_excl: false
+      op_weights:
+        read: 100
+        write: 0
+        append: 100
+        delete: 50
+        snap_create: 50
+        snap_remove: 50
+        rollback: 50
+        copy_from: 50
+        setattr: 25
+        rmattr: 25
+  - print: "**** done rados ec task"

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/5-finish-upgrade.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/5-finish-upgrade.yaml
new file mode 120000 (symlink)
index 0000000..a66a7dc
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/5-finish-upgrade.yaml
@@ -0,0 +1 @@
+../stress-split/5-finish-upgrade.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/7-final-workload.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/7-final-workload.yaml
new file mode 100644 (file)
index 0000000..50a1465
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/7-final-workload.yaml
@@ -0,0 +1,35 @@
+#
+# k=3 implies a stripe_width of 1376*3 = 4128 which is different from
+# the default value of 4096 It is also not a multiple of 1024*1024 and
+# creates situations where rounding rules during recovery becomes
+# necessary.
+#
+meta:
+- desc: |
+   randomized correctness test for rados operations on an erasure coded pool
+   using the jerasure plugin with k=3 and m=1
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    ec_pool: true
+    write_append_excl: false
+    erasure_code_profile:
+      name: jerasure31profile
+      plugin: jerasure
+      k: 3
+      m: 1
+      technique: reed_sol_van
+      crush-failure-domain: osd
+    op_weights:
+      read: 100
+      write: 0
+      append: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50
+      copy_from: 50
+      setattr: 25
+      rmattr: 25

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/objectstore b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/objectstore
new file mode 120000 (symlink)
index 0000000..016cbf9
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/objectstore
@@ -0,0 +1 @@
+../stress-split/objectstore/
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/supported-all-distro b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/supported-all-distro
new file mode 120000 (symlink)
index 0000000..ca82dde
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/supported-all-distro
@@ -0,0 +1 @@
+.qa/distros/supported-all-distro
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/thrashosds-health.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/thrashosds-health.yaml
new file mode 120000 (symlink)
index 0000000..9124eb1
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/thrashosds-health.yaml
@@ -0,0 +1 @@
+.qa/tasks/thrashosds-health.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/% b/qa/suites/upgrade/nautilus-x/stress-split/%
new file mode 100644 (file)
index 0000000..e69de29

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

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/0-cluster/+ b/qa/suites/upgrade/nautilus-x/stress-split/0-cluster/+
new file mode 100644 (file)
index 0000000..e69de29

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

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

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/0-cluster/start.yaml b/qa/suites/upgrade/nautilus-x/stress-split/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..e2096de
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/0-cluster/start.yaml
@@ -0,0 +1,40 @@
+meta:
+- desc: |
+   Run ceph on two nodes,
+   with a separate client-only node.
+   Use xfs beneath the osds.
+overrides:
+  ceph:
+    mon_bind_msgr2: false
+    mon_bind_addrvec: false
+    fs: xfs
+    log-whitelist:
+      - overall HEALTH_
+      - \(MON_DOWN\)
+      - \(MGR_DOWN\)
+      - slow request
+      - \(MON_MSGR2_NOT_ENABLED\)
+    conf:
+      global:
+        enable experimental unrecoverable data corrupting features: "*"
+        mon warn on msgr2 not enabled: false
+      mon:
+        mon warn on osd down out interval zero: false
+roles:
+- - mon.a
+  - mgr.x
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+- - mon.b
+  - osd.4
+  - osd.5
+  - osd.6
+  - osd.7
+- - mon.c
+- - osd.8
+  - osd.9
+  - osd.10
+  - osd.11
+- - client.0

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

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml
new file mode 100644 (file)
index 0000000..0596425
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml
@@ -0,0 +1,17 @@
+meta:
+- desc: install ceph/nautilus latest
+tasks:
+- install:
+    branch: nautilus
+- print: "**** done install nautilus"
+- ceph:
+- exec:
+    osd.0:
+      - ceph osd require-osd-release nautilus
+      - ceph osd set-require-min-compat-client nautilus
+- print: "**** done ceph"
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon warn on osd down out interval zero: false

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml b/qa/suites/upgrade/nautilus-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml
@@ -0,0 +1 @@
+

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml b/qa/suites/upgrade/nautilus-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml
new file mode 100644 (file)
index 0000000..e31e37b
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd min pg log entries: 1
+        osd max pg log entries: 2

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

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/nautilus-x/stress-split/2-partial-upgrade/firsthalf.yaml
new file mode 100644 (file)
index 0000000..58ff5ac
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/2-partial-upgrade/firsthalf.yaml
@@ -0,0 +1,14 @@
+meta:
+- desc: |
+   install upgrade ceph/-x on 2/3 of cluster
+   restart : mons, osd.0-7
+tasks:
+- install.upgrade:
+    mon.a:
+    mon.b:
+    mon.c:
+- print: "**** done install.upgrade of first 3 nodes"
+- ceph.restart:
+    daemons: [mon.a,mon.b,mgr.x,osd.0,osd.1,osd.2,osd.3,osd.4,osd.5,osd.6,osd.7]
+    mon-health-to-clog: false
+- print: "**** done ceph.restart of all mons and 2/3 of osds"

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

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/3-thrash/default.yaml b/qa/suites/upgrade/nautilus-x/stress-split/3-thrash/default.yaml
new file mode 100644 (file)
index 0000000..e0f317b
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/3-thrash/default.yaml
@@ -0,0 +1,26 @@
+meta:
+- desc: |
+   randomly kill and revive osd
+   small chance to increase the number of pgs
+overrides:
+  ceph:
+    log-whitelist:
+    - but it is still running
+    - wrongly marked me down
+    - objects unfound and apparently lost
+    - log bound mismatch
+tasks:
+- parallel:
+  - stress-tasks
+stress-tasks:
+- 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
+    disable_objectstore_tool_tests: true
+    chance_force_recovery: 0
+    aggressive_pg_num_changes: false
+- print: "**** done thrashosds 3-thrash"

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

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

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/radosbench.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/radosbench.yaml
new file mode 100644 (file)
index 0000000..115939e
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/radosbench.yaml
@@ -0,0 +1,52 @@
+meta:
+- desc: |
+   run randomized correctness test for rados operations
+   generate write load with rados bench
+stress-tasks:
+- full_sequential:
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+- print: "**** done radosbench 7-workload"

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-cls.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-cls.yaml
new file mode 100644 (file)
index 0000000..f8cc4d8
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-cls.yaml
@@ -0,0 +1,10 @@
+meta:
+- desc: |
+   run basic cls tests for rbd
+stress-tasks:
+- 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/upgrade/nautilus-x/stress-split/4-workload/rbd-import-export.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-import-export.yaml
new file mode 100644 (file)
index 0000000..30a677a
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-import-export.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: |
+   run basic import/export cli tests for rbd
+stress-tasks:
+- 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/upgrade/nautilus-x/stress-split/4-workload/rbd_api.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd_api.yaml
new file mode 100644 (file)
index 0000000..9079aa3
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd_api.yaml
@@ -0,0 +1,10 @@
+meta:
+- desc: |
+   librbd C and C++ api tests
+stress-tasks:
+- workunit:
+     branch: luminous
+     clients:
+        client.0:
+           - rbd/test_librbd.sh
+- print: "**** done rbd/test_librbd.sh 7-workload"

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/readwrite.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..41e34d6
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/readwrite.yaml
@@ -0,0 +1,16 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool,
+   using only reads, writes, and deletes
+stress-tasks:
+- 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/upgrade/nautilus-x/stress-split/4-workload/snaps-few-objects.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..f56d0de
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/snaps-few-objects.yaml
@@ -0,0 +1,18 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool with snapshot operations
+stress-tasks:
+- 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/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml b/qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml
new file mode 100644 (file)
index 0000000..306445c
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml
@@ -0,0 +1,15 @@
+tasks:
+- install.upgrade:
+    osd.8:
+    client.0:
+- ceph.restart:
+    daemons: [mon.c, osd.8, osd.9, osd.10, osd.11]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- exec:
+    osd.0:
+      - ceph osd set pglog_hardlimit
+      - ceph osd dump --format=json-pretty | grep "flags"
+      - ceph config set global mon_warn_on_msgr2_not_enabled false
+- print: "**** try to set pglog_hardlimit again, should succeed"
+

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/6-msgr2.yaml b/qa/suites/upgrade/nautilus-x/stress-split/6-msgr2.yaml
new file mode 100644 (file)
index 0000000..f56c8be
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/6-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/6-nautilus.yaml b/qa/suites/upgrade/nautilus-x/stress-split/6-nautilus.yaml
new file mode 120000 (symlink)
index 0000000..9e99b7d
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/6-nautilus.yaml
@@ -0,0 +1 @@
+.qa/releases/nautilus.yaml
\ No newline at end of file

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

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
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/.qa
@@ -0,0 +1 @@
+../.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
new file mode 100644 (file)
index 0000000..ca512b4
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/7-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: luminous
+    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/rgw-swift.yaml b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift.yaml
new file mode 100644 (file)
index 0000000..76e5d6f
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/7-final-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/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
new file mode 100644 (file)
index 0000000..805bf97
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/7-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

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

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/objectstore/bluestore-bitmap.yaml b/qa/suites/upgrade/nautilus-x/stress-split/objectstore/bluestore-bitmap.yaml
new file mode 120000 (symlink)
index 0000000..a59cf51
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/objectstore/bluestore-bitmap.yaml
@@ -0,0 +1 @@
+.qa/objectstore/bluestore-bitmap.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/objectstore/filestore-xfs.yaml b/qa/suites/upgrade/nautilus-x/stress-split/objectstore/filestore-xfs.yaml
new file mode 120000 (symlink)
index 0000000..41f2a9d
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/objectstore/filestore-xfs.yaml
@@ -0,0 +1 @@
+.qa/objectstore/filestore-xfs.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/supported-all-distro b/qa/suites/upgrade/nautilus-x/stress-split/supported-all-distro
new file mode 120000 (symlink)
index 0000000..ca82dde
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/stress-split/supported-all-distro
@@ -0,0 +1 @@
+.qa/distros/supported-all-distro
\ No newline at end of file

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