diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/% b/suites/upgrade/dumpling-firefly-giant/parallel/%
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/0-cluster/start.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/0-cluster/start.yaml
deleted file mode 100644
index e3d7f85f9ff..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/0-cluster/start.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      mon:
-        mon warn on legacy crush tunables: false
-    log-whitelist:
-      - scrub mismatch
-      - ScrubResult
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-  - client.1
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/1-dumpling-install/dumpling.yaml
deleted file mode 100644
index 6396b48a36b..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/1-dumpling-install/dumpling.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- install:
-   branch: dumpling 
-- print: "**** done dumpling install ****"
-- ceph:
-   fs: xfs
-- parallel:
-   - workload
-- print: "**** done parallel ****"
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/+ b/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/rados_api.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/rados_api.yaml
deleted file mode 100644
index 5138ec7ca8a..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/rados_api.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-workload:
-   sequential:
-   - workunit:
-       branch: dumpling 
-       clients:
-         client.0:
-         - rados/test.sh
-         - cls
-   - print: "**** done rados/test.sh &  cls on dumpling "
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/test_rbd_api.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/test_rbd_api.yaml
deleted file mode 100644
index 6a8918e7ed9..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/test_rbd_api.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload:
-  sequential:
-  - workunit:
-      branch: dumpling 
-      clients:
-        client.0:
-        - rbd/test_librbd.sh
-  - print: "**** done rbd/test_librbd.sh on dumpling"
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/3-firefly-upgrade/firefly.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/3-firefly-upgrade/firefly.yaml
deleted file mode 100644
index 7a9bb3666b8..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/3-firefly-upgrade/firefly.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-tasks:
-   - install.upgrade:
-       mon.a:
-         branch: firefly
-       mon.b:
-         branch: firefly
-       client.0:
-         branch: firefly
-   - print: "**** done install.upgrade from dumpling to firefly"
-   - ceph.restart:
-   - print: "**** done restart"
-   - parallel:
-     - workload2
-     - upgrade-sequence
-   - print: "**** done parallel 2"
-   - install.upgrade:
-       client.0:
-   - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg"
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/+ b/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/rados_loadgenbig.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/rados_loadgenbig.yaml
deleted file mode 100644
index a1ce588794a..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/rados_loadgenbig.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload2:
-  sequential:
-  - workunit:
-      branch: firefly 
-      clients:
-        client.0:
-        - rados/load-gen-big.sh
-  - print: "**** done rados/load-gen-big.sh on firefly"
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/test_rbd_python.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/test_rbd_python.yaml
deleted file mode 100644
index f91e860f593..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/test_rbd_python.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload2:
-  sequential:
-  - workunit:
-      branch: firefly 
-      clients:
-        client.0:
-        - rbd/test_librbd_python.sh
-  - print: "**** done rbd/test_librbd_python.sh on firefly"
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-daemon.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-daemon.yaml
deleted file mode 100644
index d7d8c84cf47..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-daemon.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         branch: giant
-   - print: "**** done install.upgrade mon.a to giant ****"
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.0, osd.1]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - print: "**** running mixed versions of osds and mons"
-   - exec:
-      mon.a:
-        - ceph osd crush tunables firefly
-   - install.upgrade:
-       mon.b:
-         branch: giant
-   - print: "**** done install.upgrade mon.b to giant ****"
-   - ceph.restart:
-       daemons: [mon.b, mon.c]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.2, osd.3]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - exec:
-      mon.a:
-        - ceph osd crush tunables firefly
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-type.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-type.yaml
deleted file mode 100644
index ce22c04a61a..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-type.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-       mon.a:
-         branch: giant
-   - print: "**** done install.upgrade mon.a to giant"
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.0, osd.1]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - print: "**** running mixed versions of osds and mons"
-   - exec:
-      mon.a:
-        - ceph osd crush tunables firefly
-   - install.upgrade:
-       mon.b:
-         branch: giant
-   - print: "**** done install.upgrade mon.b to giant"
-   - ceph.restart:
-       daemons: [mon.b, mon.c]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.2, osd.3]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - exec:
-      mon.a:
-        - ceph osd crush tunables firefly
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/+ b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
deleted file mode 120000
index 4b9d9a44a24..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados-snaps-few-objects.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados-snaps-few-objects.yaml
deleted file mode 100644
index bf85020d8d9..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados-snaps-few-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- rados:
-    clients: [client.1]
-    ops: 4000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_loadgenmix.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_loadgenmix.yaml
deleted file mode 100644
index 879b7b6d189..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_loadgenmix.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-  - workunit:
-      clients:
-        client.1:
-        - rados/load-gen-mix.sh
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_mon_thrash.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_mon_thrash.yaml
deleted file mode 100644
index 5c4c6297cfe..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_mon_thrash.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-   - sequential:
-      - mon_thrash:
-          revive_delay: 20
-          thrash_delay: 1
-      - workunit:
-          clients:
-            client.1:
-            - rados/test.sh
-      - print: "**** done rados/test.sh - 6-final-workload"
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_cls.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_cls.yaml
deleted file mode 100644
index 908b79e869a..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.1:
-      - cls/test_cls_rbd.sh
-
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_import_export.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_import_export.yaml
deleted file mode 100644
index a7ce2141ee5..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_import_export.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.1:
-        - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rgw_s3tests.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rgw_s3tests.yaml
deleted file mode 100644
index 22c3a3f821a..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rgw_s3tests.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- rgw: [client.1]
-- s3tests:
-    client.1:
-      rgw_server: client.1
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rgw_swift.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rgw_swift.yaml
deleted file mode 100644
index 0ab9febd2fc..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rgw_swift.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-# Uncomment the next line if you have not already included rgw_s3tests.yaml in your test.
-# - rgw: [client.1]
-- swift:
-    client.1:
-      rgw_server: client.1
diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/distros b/suites/upgrade/dumpling-firefly-giant/parallel/distros
deleted file mode 120000
index ca99fee94fa..00000000000
--- a/suites/upgrade/dumpling-firefly-giant/parallel/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../distros/supported/
\ No newline at end of file
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/% b/suites/upgrade/dumpling-giant-x/stress-split/%
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/0-cluster/start.yaml b/suites/upgrade/dumpling-giant-x/stress-split/0-cluster/start.yaml
deleted file mode 100644
index 504e20e2467..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/0-cluster/start.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      mon:
-        mon warn on legacy crush tunables: false
-roles:
-- - mon.a
-  - mon.b
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-  - mon.c
-- - osd.3
-  - osd.4
-  - osd.5
-- - client.0
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/1-dumpling-install/dumpling.yaml b/suites/upgrade/dumpling-giant-x/stress-split/1-dumpling-install/dumpling.yaml
deleted file mode 100644
index c98631e2bbd..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/1-dumpling-install/dumpling.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install:
-    branch: dumpling
-- ceph:
-    fs: xfs
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/2-partial-upgrade/firsthalf.yaml b/suites/upgrade/dumpling-giant-x/stress-split/2-partial-upgrade/firsthalf.yaml
deleted file mode 100644
index 312df6e21c6..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/2-partial-upgrade/firsthalf.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install.upgrade:
-    osd.0: 
-- ceph.restart:
-    daemons: [osd.0, osd.1, osd.2]
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/3-thrash/default.yaml b/suites/upgrade/dumpling-giant-x/stress-split/3-thrash/default.yaml
deleted file mode 100644
index a85510eb6fa..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/3-thrash/default.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-    thrash_primary_affinity: false
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/4-mon/mona.yaml b/suites/upgrade/dumpling-giant-x/stress-split/4-mon/mona.yaml
deleted file mode 100644
index b6ffb3323d1..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/4-mon/mona.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.a]
-    wait-for-healthy: false
-    wait-for-osds-up: true
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/5-workload/+ b/suites/upgrade/dumpling-giant-x/stress-split/5-workload/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/5-workload/rados_api_tests.yaml b/suites/upgrade/dumpling-giant-x/stress-split/5-workload/rados_api_tests.yaml
deleted file mode 100644
index d9a7270ef6e..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/5-workload/rados_api_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: giant
-    clients:
-      client.0:
-        - rados/test-upgrade-giant.sh
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/5-workload/rbd-cls.yaml b/suites/upgrade/dumpling-giant-x/stress-split/5-workload/rbd-cls.yaml
deleted file mode 100644
index 6cbf3b34f32..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/5-workload/rbd-cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: giant
-    clients:
-      client.0:
-        - cls/test_cls_rbd.sh
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/5-workload/rbd-import-export.yaml b/suites/upgrade/dumpling-giant-x/stress-split/5-workload/rbd-import-export.yaml
deleted file mode 100644
index 1faca21c6fe..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/5-workload/rbd-import-export.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-    branch: giant
-    clients:
-      client.0:
-        - rbd/import_export.sh
-    env:
-      RBD_CREATE_ARGS: --new-format
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/5-workload/readwrite.yaml b/suites/upgrade/dumpling-giant-x/stress-split/5-workload/readwrite.yaml
deleted file mode 100644
index c53e52b0872..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/5-workload/readwrite.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    op_weights:
-      read: 45
-      write: 45
-      delete: 10
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/5-workload/snaps-few-objects.yaml b/suites/upgrade/dumpling-giant-x/stress-split/5-workload/snaps-few-objects.yaml
deleted file mode 100644
index c54039766c0..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/5-workload/snaps-few-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/6-next-mon/monb.yaml b/suites/upgrade/dumpling-giant-x/stress-split/6-next-mon/monb.yaml
deleted file mode 100644
index 513890c41c0..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/6-next-mon/monb.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.b]
-    wait-for-healthy: false
-    wait-for-osds-up: true
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/7-workload/+ b/suites/upgrade/dumpling-giant-x/stress-split/7-workload/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/7-workload/rados_api_tests.yaml b/suites/upgrade/dumpling-giant-x/stress-split/7-workload/rados_api_tests.yaml
deleted file mode 100644
index d9a7270ef6e..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/7-workload/rados_api_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: giant
-    clients:
-      client.0:
-        - rados/test-upgrade-giant.sh
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/7-workload/radosbench.yaml b/suites/upgrade/dumpling-giant-x/stress-split/7-workload/radosbench.yaml
deleted file mode 100644
index 3940870fce0..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/7-workload/radosbench.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- radosbench:
-    clients: [client.0]
-    time: 1800
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/7-workload/rbd_api.yaml b/suites/upgrade/dumpling-giant-x/stress-split/7-workload/rbd_api.yaml
deleted file mode 100644
index eb3336ebb04..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/7-workload/rbd_api.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: giant
-     clients:
-        client.0:
-           - rbd/test_librbd.sh
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/8-next-mon/monc.yaml b/suites/upgrade/dumpling-giant-x/stress-split/8-next-mon/monc.yaml
deleted file mode 100644
index 73f22bd5f7c..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/8-next-mon/monc.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- install.upgrade:
-    mon.c:
-- ceph.restart:
-    daemons: [mon.c]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- ceph.wait_for_mon_quorum: [a, b, c]
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/9-workload/+ b/suites/upgrade/dumpling-giant-x/stress-split/9-workload/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/9-workload/rados_api_tests.yaml b/suites/upgrade/dumpling-giant-x/stress-split/9-workload/rados_api_tests.yaml
deleted file mode 100644
index d9a7270ef6e..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/9-workload/rados_api_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: giant
-    clients:
-      client.0:
-        - rados/test-upgrade-giant.sh
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/9-workload/rbd-python.yaml b/suites/upgrade/dumpling-giant-x/stress-split/9-workload/rbd-python.yaml
deleted file mode 100644
index 4f18d1eb2bd..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/9-workload/rbd-python.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: giant
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/9-workload/rgw-s3tests.yaml b/suites/upgrade/dumpling-giant-x/stress-split/9-workload/rgw-s3tests.yaml
deleted file mode 100644
index e44546dbcaa..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/9-workload/rgw-s3tests.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- rgw:
-    default_idle_timeout: 300
-    client.0:
-- swift:
-    client.0:
-      rgw_server: client.0
-
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/9-workload/snaps-many-objects.yaml b/suites/upgrade/dumpling-giant-x/stress-split/9-workload/snaps-many-objects.yaml
deleted file mode 100644
index 9e311c946e1..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/9-workload/snaps-many-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
diff --git a/suites/upgrade/dumpling-giant-x/stress-split/distros b/suites/upgrade/dumpling-giant-x/stress-split/distros
deleted file mode 120000
index 79010c36a59..00000000000
--- a/suites/upgrade/dumpling-giant-x/stress-split/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../distros/supported
\ No newline at end of file
diff --git a/suites/upgrade/firefly-giant-x/parallel/% b/suites/upgrade/firefly-giant-x/parallel/%
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/suites/upgrade/firefly-giant-x/parallel/0-cluster/start.yaml b/suites/upgrade/firefly-giant-x/parallel/0-cluster/start.yaml
deleted file mode 100644
index e3d7f85f9ff..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/0-cluster/start.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      mon:
-        mon warn on legacy crush tunables: false
-    log-whitelist:
-      - scrub mismatch
-      - ScrubResult
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-  - client.1
diff --git a/suites/upgrade/firefly-giant-x/parallel/1-firefly-install/firefly.yaml b/suites/upgrade/firefly-giant-x/parallel/1-firefly-install/firefly.yaml
deleted file mode 100644
index b39b5f51a7f..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/1-firefly-install/firefly.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- install:
-   branch: firefly
-- print: "**** done firefly install"
-- ceph:
-   fs: xfs
-- parallel:
-   - workload
-- print: "**** done parallel"
diff --git a/suites/upgrade/firefly-giant-x/parallel/2-workload/+ b/suites/upgrade/firefly-giant-x/parallel/2-workload/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/suites/upgrade/firefly-giant-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/firefly-giant-x/parallel/2-workload/rados_api.yaml
deleted file mode 100644
index 798d1e85a44..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/2-workload/rados_api.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-workload:
-   sequential:
-   - workunit:
-       branch: firefly
-       clients:
-         client.0:
-         - rados/test.sh
-         - cls
-   - print: "**** done rados/test.sh &  cls"
diff --git a/suites/upgrade/firefly-giant-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/firefly-giant-x/parallel/2-workload/rados_loadgenbig.yaml
deleted file mode 100644
index 2c8570e4128..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/2-workload/rados_loadgenbig.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload:
-   sequential:
-   - workunit:
-       branch: firefly
-       clients:
-         client.0:
-         - rados/load-gen-big.sh
-   - print: "**** done rados/load-gen-big.sh"
diff --git a/suites/upgrade/firefly-giant-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/firefly-giant-x/parallel/2-workload/test_rbd_api.yaml
deleted file mode 100644
index c48f5cbb06c..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/2-workload/test_rbd_api.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload:
-  sequential:
-  - workunit:
-      branch: firefly
-      clients:
-        client.0:
-        - rbd/test_librbd.sh
-  - print: "**** done rbd/test_librbd.sh"
diff --git a/suites/upgrade/firefly-giant-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/firefly-giant-x/parallel/2-workload/test_rbd_python.yaml
deleted file mode 100644
index 49c6237cff1..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/2-workload/test_rbd_python.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload:
-  sequential:
-  - workunit:
-      branch: firefly
-      clients:
-        client.0:
-        - rbd/test_librbd_python.sh
-  - print: "**** done rbd/test_librbd_python.sh"
diff --git a/suites/upgrade/firefly-giant-x/parallel/3-giant-upgrade/giant.yaml b/suites/upgrade/firefly-giant-x/parallel/3-giant-upgrade/giant.yaml
deleted file mode 100644
index f719c9203fb..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/3-giant-upgrade/giant.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-tasks:
-   - install.upgrade:
-       mon.a:
-         branch: giant
-       mon.b:
-         branch: giant
-       client.0:
-         branch: giant
-# client.1 will be upgraded as well as it's on the same host as client.0
-   - print: "**** done install.upgrade"
-   - ceph.restart:
-   - print: "**** done restart"
-   - parallel:
-     - workload2
-     - upgrade-sequence
-   - print: "**** done parallel 2"
-   - install.upgrade:
-       client.0:
-# client.1 will be upgraded as well as it's on the same host as client.0
-   - print: "**** done install.upgrade client.0 and client.1 to the version from teuthology-suite arg"
diff --git a/suites/upgrade/firefly-giant-x/parallel/4-workload/+ b/suites/upgrade/firefly-giant-x/parallel/4-workload/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/suites/upgrade/firefly-giant-x/parallel/4-workload/rados_api.yaml b/suites/upgrade/firefly-giant-x/parallel/4-workload/rados_api.yaml
deleted file mode 100644
index c55ee59e2bd..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/4-workload/rados_api.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-workload2:
-  sequential:
-  - workunit:
-      branch: giant
-      clients:
-        client.0:
-        - rados/test.sh
-        - cls
-  - print: "**** done #rados/test.sh and cls 2"
diff --git a/suites/upgrade/firefly-giant-x/parallel/4-workload/rados_loadgenbig.yaml b/suites/upgrade/firefly-giant-x/parallel/4-workload/rados_loadgenbig.yaml
deleted file mode 100644
index dc1ccc615ea..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/4-workload/rados_loadgenbig.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload2:
-  sequential:
-  - workunit:
-      branch: giant
-      clients:
-        client.0:
-        - rados/load-gen-big.sh
-  - print: "**** done rados/load-gen-big.sh 2"
diff --git a/suites/upgrade/firefly-giant-x/parallel/4-workload/test_rbd_api.yaml b/suites/upgrade/firefly-giant-x/parallel/4-workload/test_rbd_api.yaml
deleted file mode 100644
index 910f2d4b8a0..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/4-workload/test_rbd_api.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload2:
-  sequential:
-  - workunit:
-      branch: giant
-      clients:
-        client.0:
-        - rbd/test_librbd.sh
-  - print: "**** done rbd/test_librbd.sh 2"
diff --git a/suites/upgrade/firefly-giant-x/parallel/4-workload/test_rbd_python.yaml b/suites/upgrade/firefly-giant-x/parallel/4-workload/test_rbd_python.yaml
deleted file mode 100644
index 2b20b28f65b..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/4-workload/test_rbd_python.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload2:
-  sequential:
-  - workunit:
-      branch: giant
-      clients:
-        client.0:
-        - rbd/test_librbd_python.sh
-  - print: "**** done rbd/test_librbd_python.sh 2"
diff --git a/suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml b/suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml
deleted file mode 100644
index 179f52e4a66..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-daemon.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-       mon.a:
-   - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg"
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.0, osd.1]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - print: "**** running mixed versions of osds and mons"
-   - exec:
-      mon.a:
-        - ceph osd crush tunables firefly
-   - install.upgrade:
-       mon.b:
-   - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg"
-   - ceph.restart:
-       daemons: [mon.b, mon.c]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.2, osd.3]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - exec:
-      mon.a:
-        - ceph osd crush tunables firefly
diff --git a/suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml b/suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml
deleted file mode 100644
index 179f52e4a66..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/5-upgrade-sequence/upgrade-by-type.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - install.upgrade:
-       mon.a:
-   - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg"
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.0, osd.1]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - print: "**** running mixed versions of osds and mons"
-   - exec:
-      mon.a:
-        - ceph osd crush tunables firefly
-   - install.upgrade:
-       mon.b:
-   - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg"
-   - ceph.restart:
-       daemons: [mon.b, mon.c]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.2, osd.3]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart: [mds.a]
-   - sleep:
-       duration: 60
-   - exec:
-      mon.a:
-        - ceph osd crush tunables firefly
diff --git a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/+ b/suites/upgrade/firefly-giant-x/parallel/6-final-workload/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/ec-rados-default.yaml b/suites/upgrade/firefly-giant-x/parallel/6-final-workload/ec-rados-default.yaml
deleted file mode 120000
index a8a0ae69405..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/ec-rados-default.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file
diff --git a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/firefly-giant-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
deleted file mode 120000
index 4b9d9a44a24..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../erasure-code/ec-rados-plugin=jerasure-k=3-m=1.yaml
\ No newline at end of file
diff --git a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rados-snaps-few-objects.yaml
deleted file mode 100644
index bf85020d8d9..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rados-snaps-few-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- rados:
-    clients: [client.1]
-    ops: 4000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
diff --git a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rados_loadgenmix.yaml b/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rados_loadgenmix.yaml
deleted file mode 100644
index 879b7b6d189..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rados_loadgenmix.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-  - workunit:
-      clients:
-        client.1:
-        - rados/load-gen-mix.sh
diff --git a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rados_mon_thrash.yaml b/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rados_mon_thrash.yaml
deleted file mode 100644
index 5c4c6297cfe..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rados_mon_thrash.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-   - sequential:
-      - mon_thrash:
-          revive_delay: 20
-          thrash_delay: 1
-      - workunit:
-          clients:
-            client.1:
-            - rados/test.sh
-      - print: "**** done rados/test.sh - 6-final-workload"
diff --git a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rbd_cls.yaml b/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rbd_cls.yaml
deleted file mode 100644
index 908b79e869a..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rbd_cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.1:
-      - cls/test_cls_rbd.sh
-
diff --git a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rbd_import_export.yaml b/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rbd_import_export.yaml
deleted file mode 100644
index a7ce2141ee5..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rbd_import_export.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.1:
-        - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format
diff --git a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rgw_s3tests.yaml b/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rgw_s3tests.yaml
deleted file mode 100644
index 22c3a3f821a..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rgw_s3tests.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- rgw: [client.1]
-- s3tests:
-    client.1:
-      rgw_server: client.1
diff --git a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rgw_swift.yaml b/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rgw_swift.yaml
deleted file mode 100644
index 0ab9febd2fc..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/6-final-workload/rgw_swift.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-# Uncomment the next line if you have not already included rgw_s3tests.yaml in your test.
-# - rgw: [client.1]
-- swift:
-    client.1:
-      rgw_server: client.1
diff --git a/suites/upgrade/firefly-giant-x/parallel/README b/suites/upgrade/firefly-giant-x/parallel/README
deleted file mode 100644
index 3f53c20a0e3..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/README
+++ /dev/null
@@ -1,72 +0,0 @@
-Purpose
-=======
-
-This suite tests upgrades of a ceph cluster from firefly (current
-branch) to giant (current branch), and then to a later specified
-version (version x, e.g. for example ‘next’ or ‘master’). It runs the
-last upgrade (steps in 3-giant-upgrade) in parallel with firefly
-client tests.
-
-
-Structure
-=========
-
-Generally the flow is:
-- install firefly
-- test it
-- upgrade cluster and clients to giant
-- test giant while upgrading cluster to version x
-- upgrade clients
-- test with version x clients
-
-0-cluster
----------
-
-Defines the cluster layout - two nodes run ceph daemons, and a third
-acts as a client.  (This is under 'roles:' section in the final yaml)
-
-1-firefly-install
-------------------
-
-Installs firefly and runs correctness tests from the 'workload' section
-
-2-workload
-----------
-
-Defines the 'workload' section - correctness tests to run on firefly
-“+” is used to construct a single yaml load from all tests in this directory
-
-3-giant-upgrade
------------------
-
-First upgrades everything to giant. Then upgrades the cluster to
-version x while running correctness tests (from the 'workload2'
-section) on giant clients in parallel. This upgrade is done by the
-'upgrade-sequence' section, defined later. Once the cluster is
-upgraded and these tests complete, upgrades the clients to version x
-as well.
-
-Clients are upgraded last to avoid running newer tests that don't work
-against giant, and to verify that giant clients can continue
-working with a newer cluster.
-
-4-workload
-----------
-
-Defines the 'workload2' section - correctness tests to run during the
-upgrade from giant to version x.
-“+” is used to construct a single yaml load from all tests in this directory
-
-5-upgrade-sequence
-------------------
-
-Defines the 'upgrade-sequence' section - the order in which the
-upgrade from giant to version x is done. Note that leaving the
-version unspecified here is what makes it upgrade to version x,
-which is set as an override when this suite is scheduled.
-
-6-final-workload
-----------------
-
-Runs some final correctness tests of version x clients.
-“+” is used to construct a single yaml load from all tests in this directory
diff --git a/suites/upgrade/firefly-giant-x/parallel/distros b/suites/upgrade/firefly-giant-x/parallel/distros
deleted file mode 120000
index ca99fee94fa..00000000000
--- a/suites/upgrade/firefly-giant-x/parallel/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../distros/supported/
\ No newline at end of file