qa/suites: some clean up for quincy

- remove upgrades from nautilus
- stubs for completing upgrade to quincy

Still missing the pacific-x upgrade tests.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index b64ea2bb5a4e20587140ad1571c4a69ee15b4f63..2668ed84469ede7aeaafec45e53b33425bf9696a 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -87,10 +87,10 @@ QA suite
 --------
 
 - [ ] create qa/suites/upgrade/(X-1)-x
-- [ ] remove qa/suites/upgrade/(X-3)-x-*
-- [ ] remove qa/suites/rados/upgrade/(X-3)-x-singleton symlink
-- [ ] create qa/releases/X.yaml
-- [ ] create qa/suites/rados/thrash-old-clients/1-install/(X-1).yaml
+- [x] remove qa/suites/upgrade/(X-3)-x-*
+- [x] remove qa/suites/rados/upgrade/(X-3)-x-singleton symlink
+- [x] create qa/releases/X.yaml
+- [ ] create qa/suites/rados/cephadm/thrash-old-clients/1-install/(X-1).yaml
 
 
 

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

diff --git a/qa/suites/rados/cephadm/thrash-old-clients/1-install/pacific.yaml b/qa/suites/rados/cephadm/thrash-old-clients/1-install/pacific.yaml
new file mode 100644 (file)
index 0000000..8b185df
--- /dev/null
+++ b/qa/suites/rados/cephadm/thrash-old-clients/1-install/pacific.yaml
@@ -0,0 +1,34 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - \(MON_DOWN\)
+tasks:
+- install:
+    branch: pacific
+    exclude_packages:
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - ceph-base-debuginfo
+      - ceph-common-debuginfo
+      - ceph-immutable-object-cache-debuginfo
+      - ceph-radosgw-debuginfo
+      - ceph-test-debuginfo
+      - ceph-base-debuginfo
+      - ceph-mgr-debuginfo
+      - ceph-mds-debuginfo
+      - ceph-mon-debuginfo
+      - ceph-osd-debuginfo
+      - ceph-fuse-debuginfo
+      - librados-devel-debuginfo
+      - libcephfs2-debuginfo
+      - librados2-debuginfo
+      - librbd1-debuginfo
+      - python3-cephfs-debuginfo
+      - python3-rados-debuginfo
+      - python3-rbd-debuginfo
+      - python3-rgw-debuginfo
+      - rbd-fuse-debuginfo
+      - rbd-mirror-debuginfo
+      - rbd-nbd-debuginfo

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

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

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

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

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

diff --git a/qa/suites/upgrade/nautilus-x-singleton/0-cluster/openstack.yaml b/qa/suites/upgrade/nautilus-x-singleton/0-cluster/openstack.yaml
deleted file mode 100644 (file)
index a0d5c20..0000000
--- a/qa/suites/upgrade/nautilus-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/upgrade/nautilus-x-singleton/0-cluster/start.yaml b/qa/suites/upgrade/nautilus-x-singleton/0-cluster/start.yaml
deleted file mode 100644 (file)
index ee3f97a..0000000
--- a/qa/suites/upgrade/nautilus-x-singleton/0-cluster/start.yaml
+++ /dev/null
@@ -1,39 +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
-        bluestore warn on no per pool omap: false
-        mon pg warn min per osd: 0
-      mds:
-        debug ms: 1
-        debug mds: 20
-roles:
-- - mon.a
-  - mgr.x
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-  - osd.3
-- - mon.b
-  - mgr.y
-  - 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-singleton/1-install/.qa b/qa/suites/upgrade/nautilus-x-singleton/1-install/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x-singleton/1-install/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml
deleted file mode 100644 (file)
index ecb1035..0000000
--- a/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - \(MON_DOWN\)
-      - \(MGR_DOWN\)
-      - slow request
-      - Not found or unloadable
-      - evicting unresponsive client
-meta:
-- desc: install ceph/nautilus latest
-tasks:
-- install:
-    branch: nautilus
-    exclude_packages:
-      - ceph-mgr-cephadm
-      - cephadm
-- print: "**** done install nautilus"
-- ceph:
-- print: "**** done ceph"
-
-# create a hit set test pool that will generate hit sets prior to octopus
-- exec:
-    mon.a:
-      - sudo ceph osd pool create test-hit-set-base 32
-      - sudo ceph osd pool create test-hit-set-cache 32
-      - sudo ceph osd tier add test-hit-set-base test-hit-set-cache
-      - sudo ceph osd pool set test-hit-set-cache hit_set_type bloom
-      - sudo ceph osd pool set test-hit-set-cache hit_set_count 32
-      - sudo ceph osd pool set test-hit-set-cache hit_set_period 15
-      - rados -p test-hit-set-cache bench 30 write -b 1

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

diff --git a/qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/firsthalf.yaml
deleted file mode 100644 (file)
index 90c28d4..0000000
--- a/qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/firsthalf.yaml
+++ /dev/null
@@ -1,20 +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: [mgr.x, mgr.y]
-- 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/upgrade/nautilus-x-singleton/3-thrash/.qa b/qa/suites/upgrade/nautilus-x-singleton/3-thrash/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x-singleton/3-thrash/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x-singleton/3-thrash/default.yaml b/qa/suites/upgrade/nautilus-x-singleton/3-thrash/default.yaml
deleted file mode 100644 (file)
index 5360e86..0000000
--- a/qa/suites/upgrade/nautilus-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-ignorelist:
-    - 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/upgrade/nautilus-x-singleton/4-workload/+ b/qa/suites/upgrade/nautilus-x-singleton/4-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

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

diff --git a/qa/suites/upgrade/nautilus-x-singleton/4-workload/rbd-cls.yaml b/qa/suites/upgrade/nautilus-x-singleton/4-workload/rbd-cls.yaml
deleted file mode 100644 (file)
index 31ca77e..0000000
--- a/qa/suites/upgrade/nautilus-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: nautilus
-      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-singleton/4-workload/rbd-import-export.yaml b/qa/suites/upgrade/nautilus-x-singleton/4-workload/rbd-import-export.yaml
deleted file mode 100644 (file)
index 489ef9b..0000000
--- a/qa/suites/upgrade/nautilus-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: nautilus
-      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-singleton/4-workload/readwrite.yaml b/qa/suites/upgrade/nautilus-x-singleton/4-workload/readwrite.yaml
deleted file mode 100644 (file)
index 8833d4d..0000000
--- a/qa/suites/upgrade/nautilus-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/upgrade/nautilus-x-singleton/4-workload/snaps-few-objects.yaml b/qa/suites/upgrade/nautilus-x-singleton/4-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index c96cfbe..0000000
--- a/qa/suites/upgrade/nautilus-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/upgrade/nautilus-x-singleton/5-workload/+ b/qa/suites/upgrade/nautilus-x-singleton/5-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

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

diff --git a/qa/suites/upgrade/nautilus-x-singleton/5-workload/radosbench.yaml b/qa/suites/upgrade/nautilus-x-singleton/5-workload/radosbench.yaml
deleted file mode 100644 (file)
index 2cfbf1d..0000000
--- a/qa/suites/upgrade/nautilus-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/upgrade/nautilus-x-singleton/5-workload/rbd_api.yaml b/qa/suites/upgrade/nautilus-x-singleton/5-workload/rbd_api.yaml
deleted file mode 100644 (file)
index c221617..0000000
--- a/qa/suites/upgrade/nautilus-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: nautilus
-      clients:
-        client.0:
-           - rbd/test_librbd.sh
-  - print: "**** done rbd/test_librbd.sh 7-workload"

diff --git a/qa/suites/upgrade/nautilus-x-singleton/6-finish-upgrade.yaml b/qa/suites/upgrade/nautilus-x-singleton/6-finish-upgrade.yaml
deleted file mode 100644 (file)
index 222ba48..0000000
--- a/qa/suites/upgrade/nautilus-x-singleton/6-finish-upgrade.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-meta:
-- desc: |
-    install upgrade on remaining node
-    restartin remaining osds
-overrides:
-  ceph:
-    log-ignorelist:
-      - 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:
-
-# reduce canary pool hit set count from 32 -> 4 and do some io so that
-# we are sure they will be trimmed post-upgrade.
-- exec:
-    mon.a:
-      - sudo ceph osd pool set test-hit-set-cache hit_set_count 4
-      - rados -p test-hit-set-cache bench 5 write -b 1

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

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

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

diff --git a/qa/suites/upgrade/nautilus-x-singleton/8-workload/rbd-python.yaml b/qa/suites/upgrade/nautilus-x-singleton/8-workload/rbd-python.yaml
deleted file mode 100644 (file)
index 56ba21d..0000000
--- a/qa/suites/upgrade/nautilus-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/upgrade/nautilus-x-singleton/8-workload/snaps-many-objects.yaml b/qa/suites/upgrade/nautilus-x-singleton/8-workload/snaps-many-objects.yaml
deleted file mode 100644 (file)
index 805bf97..0000000
--- a/qa/suites/upgrade/nautilus-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/upgrade/nautilus-x-singleton/bluestore-bitmap.yaml b/qa/suites/upgrade/nautilus-x-singleton/bluestore-bitmap.yaml
deleted file mode 120000 (symlink)
index a59cf51..0000000
--- a/qa/suites/upgrade/nautilus-x-singleton/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/nautilus-x-singleton/mon_election b/qa/suites/upgrade/nautilus-x-singleton/mon_election
deleted file mode 120000 (symlink)
index 3f331e6..0000000
--- a/qa/suites/upgrade/nautilus-x-singleton/mon_election
+++ /dev/null
@@ -1 +0,0 @@
-.qa/mon_election
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x-singleton/thrashosds-health.yaml b/qa/suites/upgrade/nautilus-x-singleton/thrashosds-health.yaml
deleted file mode 120000 (symlink)
index 9124eb1..0000000
--- a/qa/suites/upgrade/nautilus-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/upgrade/nautilus-x-singleton/ubuntu_latest.yaml b/qa/suites/upgrade/nautilus-x-singleton/ubuntu_latest.yaml
deleted file mode 120000 (symlink)
index 3a09f9a..0000000
--- a/qa/suites/upgrade/nautilus-x-singleton/ubuntu_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file

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

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

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

diff --git a/qa/suites/upgrade/nautilus-x/parallel/0-cluster/.qa b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/0-cluster/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.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
deleted file mode 100644 (file)
index f4d1349..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/start.yaml
deleted file mode 100644 (file)
index 71a64bb..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/0-cluster/start.yaml
+++ /dev/null
@@ -1,46 +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:
-    log-ignorelist:
-    - scrub mismatch
-    - ScrubResult
-    - wrongly marked
-    - \(POOL_APP_NOT_ENABLED\)
-    - \(SLOW_OPS\)
-    - overall HEALTH_
-    - slow request
-    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: "*"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/.qa b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.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
deleted file mode 100644 (file)
index ce82cdb..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-meta:
-- desc: |
-   install ceph/nautilus latest
-   run workload and upgrade-sequence in parallel
-   upgrade the client node
-tasks:
-- install:
-    exclude_packages:
-      - ceph-mgr-cephadm
-      - cephadm
-      - libcephfs-dev
-    branch: nautilus
-- print: "**** done installing nautilus"
-- ceph:
-    log-ignorelist:
-      - 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
-      - Not found or unloadable
-      - evicting unresponsive client
-    conf:
-      global:
-        mon warn on pool no app: false
-        bluestore_warn_on_legacy_statfs: false
-        bluestore warn on no per pool omap: false
-        mon pg warn min per osd: 0
-- exec:
-    osd.0:
-      - 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"
-- rgw:
-   - client.1
-- print: "**** done => started rgw client.1"
-- 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/.qa b/qa/suites/upgrade/nautilus-x/parallel/1.1-pg-log-overrides/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/1.1-pg-log-overrides/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

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
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml
+++ /dev/null
@@ -1 +0,0 @@
-

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
deleted file mode 100644 (file)
index e31e37b..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/parallel/2-workload/+ b/qa/suites/upgrade/nautilus-x/parallel/2-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/.qa b/qa/suites/upgrade/nautilus-x/parallel/2-workload/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/2-workload/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.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
deleted file mode 100644 (file)
index 021fcc6..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/parallel/2-workload/ec-rados-default.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/ec-rados-default.yaml
deleted file mode 100644 (file)
index 5c5a958..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/parallel/2-workload/rados_api.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_api.yaml
deleted file mode 100644 (file)
index 3a5c03b..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_api.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   object class functional tests
-workload:
-  full_sequential:
-    - workunit:
-        branch: nautilus
-        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
deleted file mode 100644 (file)
index 7258c47..0000000
--- a/qa/suites/upgrade/nautilus-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: nautilus
-        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
deleted file mode 100644 (file)
index 7c8dd21..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: |
-   rgw ragweed prepare
-workload:
-  full_sequential:
-  - sequential:
-    - 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
deleted file mode 100644 (file)
index 4e232bb..0000000
--- a/qa/suites/upgrade/nautilus-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: nautilus
-        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
deleted file mode 100644 (file)
index 9ac09ae..0000000
--- a/qa/suites/upgrade/nautilus-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: nautilus
-        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
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.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
deleted file mode 100644 (file)
index e8349b6..0000000
--- a/qa/suites/upgrade/nautilus-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, rgw.*]
-       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
deleted file mode 100644 (file)
index f11ad12..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,53 +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
-   step three ordering: client.1
-   ceph expected to be healthy state after each step
-upgrade-sequence:
-   sequential:
-   - ceph.restart:
-       daemons: [mgr.x, mon.a]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.b]
-       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
-   - 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
-   - ceph.restart:
-       daemons: [rgw.*]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60

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

diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/.qa b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.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
deleted file mode 100644 (file)
index 205f72e..0000000
--- a/qa/suites/upgrade/nautilus-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/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
deleted file mode 100644 (file)
index d8b3dcb..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/parallel/5-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados_loadgenmix.yaml
deleted file mode 100644 (file)
index 922a9da..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/parallel/5-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rados_mon_thrash.yaml
deleted file mode 100644 (file)
index 08706df..0000000
--- a/qa/suites/upgrade/nautilus-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-ignorelist:
-      - 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
deleted file mode 100644 (file)
index aaf0a37..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/parallel/5-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rbd_import_export.yaml
deleted file mode 100644 (file)
index 46e1355..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/parallel/5-final-workload/rgw.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml
deleted file mode 100644 (file)
index de95994..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-overrides:
-  rgw:
-    frontend: civetweb
-tasks:
-  - sequential:
-    - rgw-final-workload
-    - print: "**** done rgw 4-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
deleted file mode 100644 (file)
index 7f31cac..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/parallel/mon_election b/qa/suites/upgrade/nautilus-x/parallel/mon_election
deleted file mode 120000 (symlink)
index 3f331e6..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/mon_election
+++ /dev/null
@@ -1 +0,0 @@
-.qa/mon_election
\ No newline at end of file

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

diff --git a/qa/suites/upgrade/nautilus-x/parallel/ubuntu_18.04.yaml b/qa/suites/upgrade/nautilus-x/parallel/ubuntu_18.04.yaml
deleted file mode 120000 (symlink)
index cfb85f1..0000000
--- a/qa/suites/upgrade/nautilus-x/parallel/ubuntu_18.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/ubuntu_18.04.yaml
\ 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/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/.qa b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.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
deleted file mode 120000 (symlink)
index 3580937..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split-erasure-code/1-nautilus-install b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1-nautilus-install
deleted file mode 120000 (symlink)
index 0479ac5..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1-nautilus-install
+++ /dev/null
@@ -1 +0,0 @@
-../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/.qa b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1.1-pg-log-overrides/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/1.1-pg-log-overrides/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ 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
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/qa/suites/upgrade/nautilus-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/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
deleted file mode 100644 (file)
index e31e37b..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split-erasure-code/2-partial-upgrade b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/2-partial-upgrade
deleted file mode 120000 (symlink)
index ab35fc1..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split-erasure-code/3-thrash/.qa b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/3-thrash/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split-erasure-code/3-thrash/default.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/3-thrash/default.yaml
deleted file mode 100644 (file)
index 3290918..0000000
--- a/qa/suites/upgrade/nautilus-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-ignorelist:
-    - 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/3.1-objectstore b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/3.1-objectstore
deleted file mode 120000 (symlink)
index 016cbf9..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/3.1-objectstore
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/objectstore/
\ No newline at end of file

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

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

diff --git a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/4-ec-workload/rados-ec-workload.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/4-ec-workload/rados-ec-workload.yaml
deleted file mode 100644 (file)
index c89551e..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/4-ec-workload/rados-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/nautilus-x/stress-split-erasure-code/4-ec-workload/rbd-ec-workload.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/4-ec-workload/rbd-ec-workload.yaml
deleted file mode 100644 (file)
index d0e661d..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/4-ec-workload/rbd-ec-workload.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-meta:
-- desc: |
-   run rbd tests on EC pool
-   overrides => force bluestore since it's required for ec-overwrite
-   use an EC pool for rbd and run xfstests on top of it to verify correctness
-tasks:
-- exec:
-    client.0:
-      - sudo ceph osd erasure-code-profile set teuthologyprofile crush-failure-domain=osd m=1 k=2
-      - sudo ceph osd pool create datapool 4 4 erasure teuthologyprofile
-      - sudo ceph osd pool set datapool allow_ec_overwrites true
-      - rbd pool init datapool
-- qemu:
-    all:
-      clone: true
-      type: block
-      disks: 3
-      test: qa/run_xfstests_qemu.sh
-- print: "**** done rbd/qemu ec task"
-exclude_arch: armv7l
-overrides:
-  thrashosds:
-    bdev_inject_crash: 2
-    bdev_inject_crash_probability: .5
-  ceph:
-    fs: xfs
-    conf:
-      client:
-        rbd default data pool: datapool
-      osd: # force bluestore since it's required for ec overwrites
-        osd objectstore: bluestore

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
deleted file mode 120000 (symlink)
index a66a7dc..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split-erasure-code/6-octopus.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/6-octopus.yaml
deleted file mode 120000 (symlink)
index 3449838..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/6-octopus.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/releases/octopus.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
deleted file mode 100644 (file)
index 50a1465..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split-erasure-code/mon_election b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/mon_election
deleted file mode 120000 (symlink)
index 3f331e6..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/mon_election
+++ /dev/null
@@ -1 +0,0 @@
-.qa/mon_election
\ 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
deleted file mode 120000 (symlink)
index 9124eb1..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split-erasure-code/ubuntu_18.04.yaml b/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/ubuntu_18.04.yaml
deleted file mode 120000 (symlink)
index cfb85f1..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split-erasure-code/ubuntu_18.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/ubuntu_18.04.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/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/.qa b/qa/suites/upgrade/nautilus-x/stress-split/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.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/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/0-cluster/.qa b/qa/suites/upgrade/nautilus-x/stress-split/0-cluster/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/0-cluster/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.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
deleted file mode 100644 (file)
index 5caffc3..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split/0-cluster/start.yaml b/qa/suites/upgrade/nautilus-x/stress-split/0-cluster/start.yaml
deleted file mode 100644 (file)
index 5d61bb7..0000000
--- a/qa/suites/upgrade/nautilus-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-ignorelist:
-      - 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
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml
deleted file mode 100644 (file)
index 7f97631..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-meta:
-- desc: install ceph/nautilus latest
-tasks:
-- install:
-    exclude_packages:
-      - ceph-mgr-cephadm
-      - cephadm
-      - libcephfs-dev
-    branch: nautilus
-- print: "**** done install nautilus"
-- ceph:
-    conf:
-      global:
-        bluestore_warn_on_legacy_statfs: false
-        bluestore warn on no per pool omap: false
-        mon pg warn min per osd: 0
-    log-ignorelist:
-      - Not found or unloadable
-      - evicting unresponsive client
-- exec:
-    osd.0:
-      - ceph osd require-osd-release nautilus
-      - ceph osd set-require-min-compat-client nautilus
-- print: "**** done ceph"
-- rgw:
-   - client.0
-- print: "**** done => started rgw client.0"
-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/.qa b/qa/suites/upgrade/nautilus-x/stress-split/1.1-pg-log-overrides/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/1.1-pg-log-overrides/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

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
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml
+++ /dev/null
@@ -1 +0,0 @@
-

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
deleted file mode 100644 (file)
index e31e37b..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split/2-partial-upgrade/.qa b/qa/suites/upgrade/nautilus-x/stress-split/2-partial-upgrade/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/nautilus-x/stress-split/2-partial-upgrade/firsthalf.yaml
deleted file mode 100644 (file)
index 58ff5ac..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split/3-thrash/.qa b/qa/suites/upgrade/nautilus-x/stress-split/3-thrash/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/3-thrash/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.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
deleted file mode 100644 (file)
index 2be9c1f..0000000
--- a/qa/suites/upgrade/nautilus-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-ignorelist:
-    - 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/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/.qa b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.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
deleted file mode 100644 (file)
index 115939e..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split/4-workload/rbd-cls.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rbd-cls.yaml
deleted file mode 100644 (file)
index 0a1fa63..0000000
--- a/qa/suites/upgrade/nautilus-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: nautilus
-    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
deleted file mode 100644 (file)
index 703f4f7..0000000
--- a/qa/suites/upgrade/nautilus-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: nautilus
-    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
deleted file mode 100644 (file)
index c6a4de9..0000000
--- a/qa/suites/upgrade/nautilus-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: nautilus
-     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
deleted file mode 100644 (file)
index 41e34d6..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split/4-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rgw_ragweed_prepare.yaml
deleted file mode 100644 (file)
index 8adde7e..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rgw_ragweed_prepare.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: |
-   rgw ragweed prepare before upgrade
-stress-tasks:
-  - full_sequential:
-     - sequential:
-       - ragweed:
-           client.0:
-             default-branch: ceph-nautilus
-             rgw_server: client.0
-             stages: prepare
-       - print: "**** done rgw ragweed prepare 4-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
deleted file mode 100644 (file)
index f56d0de..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split/5-finish-upgrade.yaml b/qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml
deleted file mode 100644 (file)
index 44c78c0..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-tasks:
-- install.upgrade:
-    osd.8:
-    client.0:
-    extra_packages:
-      - python3-rados
-      - python3-rgw
-      - python3-rbd
-      - python3-cephfs
-- ceph.restart:
-    daemons: [mon.c, osd.8, osd.9, osd.10, osd.11, rgw.*]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** restarted/upgrated => mon.c, osd.8, osd.9, osd.10, osd.11, rgw.*"
-- 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-octopus.yaml b/qa/suites/upgrade/nautilus-x/stress-split/6-octopus.yaml
deleted file mode 120000 (symlink)
index 3449838..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/6-octopus.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/releases/octopus.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/7-msgr2.yaml b/qa/suites/upgrade/nautilus-x/stress-split/7-msgr2.yaml
deleted file mode 100644 (file)
index f56c8be..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/7-msgr2.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- exec:
-    mon.a:
-      - ceph mon enable-msgr2
-      - ceph config rm global mon_warn_on_msgr2_not_enabled
-- ceph.healthy:

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

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

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/8-final-workload/rbd-python.yaml b/qa/suites/upgrade/nautilus-x/stress-split/8-final-workload/rbd-python.yaml
deleted file mode 100644 (file)
index 42cc6c6..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/8-final-workload/rbd-python.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-meta:
-- desc: |
-   librbd python api tests
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default clone format: 1
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh
-- print: "**** done rbd/test_librbd_python.sh 9-workload"

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

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

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/objectstore/.qa b/qa/suites/upgrade/nautilus-x/stress-split/objectstore/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/objectstore/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.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
deleted file mode 120000 (symlink)
index a59cf51..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split/objectstore/filestore-xfs.yaml b/qa/suites/upgrade/nautilus-x/stress-split/objectstore/filestore-xfs.yaml
deleted file mode 120000 (symlink)
index 41f2a9d..0000000
--- a/qa/suites/upgrade/nautilus-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/nautilus-x/stress-split/thrashosds-health.yaml b/qa/suites/upgrade/nautilus-x/stress-split/thrashosds-health.yaml
deleted file mode 120000 (symlink)
index 9124eb1..0000000
--- a/qa/suites/upgrade/nautilus-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/stress-split/ubuntu_18.04.yaml b/qa/suites/upgrade/nautilus-x/stress-split/ubuntu_18.04.yaml
deleted file mode 120000 (symlink)
index cfb85f1..0000000
--- a/qa/suites/upgrade/nautilus-x/stress-split/ubuntu_18.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/ubuntu_18.04.yaml
\ No newline at end of file