31 files changed, 0 insertions, 337 deletions

diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/% b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/%
deleted file mode 100644
index e69de29..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/%
+++ /dev/null
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml
deleted file mode 100644
index bbddfb3..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      mon:
-        mon warn on legacy crush tunables: false
-        mon debug unsafe allow tier with nonempty snaps: true
-    log-whitelist:
-      - but it is still running
-      - wrongly marked me down
-      - reached quota
-roles:
-- - mon.a
-  - osd.0
-  - osd.1
-  - mgr.x
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-  - client.1
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml
deleted file mode 100644
index c57e071..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/1-hammer-jewel-install/hammer-jewel.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-tasks:
-- install:
-    branch: hammer
-    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
-- print: "**** done hammer"
-- ceph:
-   fs: xfs
-   skip_mgr_daemons: true
-   add_osds_to_crush: true
-- install.upgrade:
-    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
-    osd.0:
-      branch: jewel
-    osd.2:
-      branch: jewel
-- print: "*** client.0 upgraded packages to jewel"
-- parallel:
-   - workload
-   - upgrade-sequence
-- print: "**** done parallel"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/+ b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/+
deleted file mode 100644
index e69de29..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/+
+++ /dev/null
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/ec-rados-default.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/ec-rados-default.yaml
deleted file mode 100644
index e4f3ee1..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/ec-rados-default.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-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/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_api.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_api.yaml
deleted file mode 100644
index d86c2d2..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_api.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload:
-  full_sequential:
-    - workunit:
-        branch: hammer
-        clients:
-          client.0:
-            - cls
-    - print: "**** done cls 2-workload"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_loadgenbig.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_loadgenbig.yaml
deleted file mode 100644
index 50ba808..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/rados_loadgenbig.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload:
-  full_sequential:
-    - workunit:
-        branch: hammer
-        clients:
-          client.0:
-            - rados/load-gen-big.sh
-    - print: "**** done rados/load-gen-big.sh 2-workload"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_api.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_api.yaml
deleted file mode 100644
index 997f7ba..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_api.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload:
-  full_sequential:
-    - workunit:
-        branch: hammer
-        clients:
-          client.0:
-            - rbd/test_librbd.sh
-    - print: "**** done rbd/test_librbd.sh 2-workload"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_python.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_python.yaml
deleted file mode 100644
index d1046da..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/2-workload/test_rbd_python.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload:
-  full_sequential:
-    - workunit:
-        branch: hammer
-        clients:
-          client.0:
-            - rbd/test_librbd_python.sh
-    - print: "**** done rbd/test_librbd_python.sh 2-workload"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
deleted file mode 100644
index 1aaeac8..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - ceph.restart:
-       daemons: [osd.0, osd.1, osd.2, osd.3]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - ceph.restart:
-       daemons: [mon.a, mon.b, mon.c]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - print: "**** done ceph.restart do not wait for healthy"
-   - exec:
-       mon.a:
-         - sleep 300 # http://tracker.ceph.com/issues/17808
-         - ceph osd set sortbitwise
-         - ceph osd set require_jewel_osds
-   - ceph.healthy:
-   - print: "**** done ceph.healthy"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
deleted file mode 100644
index f2093da..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - ceph.restart:
-       daemons: [osd.0, osd.1]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.2, osd.3]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [mon.a]
-       wait-for-healthy: false
-   - sleep:
-       duration: 60
-   - print: "**** running mixed versions of osds and mons"
-#do we need to use "ceph osd crush tunables hammer" ?
-   - exec:
-      mon.b:
-        - sudo ceph osd crush tunables hammer
-   - print: "**** done ceph osd crush tunables hammer"
-   - ceph.restart:
-       daemons: [mon.b, mon.c]
-       wait-for-healthy: false
-   - sleep:
-       duration: 30
-   - exec:
-       osd.0:
-         - sleep 300 # http://tracker.ceph.com/issues/17808
-         - ceph osd set sortbitwise
-         - ceph osd set require_jewel_osds
-   - ceph.healthy:
-   - sleep:
-       duration: 60
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/3.5-finish.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/3.5-finish.yaml
deleted file mode 100644
index 60a3cb6..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/3.5-finish.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- install.upgrade:
-    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
-    client.0:
-      branch: jewel
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/4-jewel.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/4-jewel.yaml
deleted file mode 120000
index 987c18c..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/4-jewel.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../releases/jewel.yaml
\ No newline at end of file
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml
deleted file mode 100644
index ab41db6..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/5-hammer-jewel-x-upgrade/hammer-jewel-x.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-tasks:
-   - install.upgrade:
-       exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
-       client.0:
-         branch: jewel
-   - print: "**** done install.upgrade client.0 to jewel"
-   - install.upgrade:
-       osd.0:
-       osd.2:
-   - print: "**** done install.upgrade daemons to x"
-   - parallel:
-     - workload2
-     - upgrade-sequence2
-   - print: "**** done parallel workload2 and upgrade-sequence2"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/+ b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/+
deleted file mode 100644
index e69de29..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/+
+++ /dev/null
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/ec-rados-default.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/ec-rados-default.yaml
deleted file mode 100644
index 9818541..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/ec-rados-default.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-meta:
-- desc: |
-   run run randomized correctness test for rados operations
-   on an erasure-coded pool
-workload2:
-  full_sequential:
-  - rados:
-      erasure_code_profile:
-        name: teuthologyprofile2
-        k: 2
-        m: 1
-        crush-failure-domain: osd
-      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/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml
deleted file mode 100644
index 088976b..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_api.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   object class functional tests
-workload2:
-  full_sequential:
-    - workunit:
-        branch: jewel
-        clients:
-          client.0:
-            - cls
-    - print: "**** done cls 2-workload"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml
deleted file mode 100644
index 30f1307..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/rados_loadgenbig.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   generate read/write load with rados objects ranging from 1MB to 25MB
-workload2:
-  full_sequential:
-    - workunit:
-        branch: jewel
-        clients:
-          client.0:
-            - rados/load-gen-big.sh
-    - print: "**** done rados/load-gen-big.sh 2-workload"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml
deleted file mode 100644
index e21839b..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_api.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   librbd C and C++ api tests
-workload2:
-  full_sequential:
-    - workunit:
-        branch: jewel
-        clients:
-          client.0:
-            - rbd/test_librbd.sh
-    - print: "**** done rbd/test_librbd.sh 2-workload"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml
deleted file mode 100644
index cae2c06..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/6-workload/test_rbd_python.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   librbd python api tests
-workload2:
-  full_sequential:
-    - workunit:
-        branch: jewel
-        clients:
-          client.0:
-            - rbd/test_librbd_python.sh
-    - print: "**** done rbd/test_librbd_python.sh 2-workload"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml
deleted file mode 100644
index 356f8ad..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-meta:
-- desc: |
-   upgrade the ceph cluster
-upgrade-sequence2:
-   sequential:
-   - ceph.restart:
-       daemons: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - print: "**** done ceph.restart all"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml
deleted file mode 100644
index 0a69a7f..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-meta:
-- desc: |
-   upgrade the ceph cluster,
-   upgrate in two steps
-   step one ordering: mon.a, mon.b, mon.c, osd.0, osd.1
-   step two ordering: osd.2, osd.3
-   ceph expected to be healthy state after each step
-upgrade-sequence2:
-   sequential:
-   - ceph.restart:
-       daemons: [mon.a, mon.b, mon.c]
-       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.b:
-        - sudo ceph osd crush tunables jewel
-   - print: "**** done ceph osd crush tunables jewel"
-   - ceph.restart:
-       daemons: [osd.2, osd.3]
-       wait-for-healthy: false
-       wait-for-osds-up: true
-   - sleep:
-       duration: 60
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/8-luminous.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/8-luminous.yaml
deleted file mode 120000
index 5283ac7..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/8-luminous.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../releases/luminous.yaml
\ No newline at end of file
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/+ b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/+
deleted file mode 100644
index e69de29..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/+
+++ /dev/null
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados-snaps-few-objects.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados-snaps-few-objects.yaml
deleted file mode 100644
index e0b0ba1..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados-snaps-few-objects.yaml
+++ /dev/null
@@ -1,13 +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
-- print: "**** done 7-final-workload/rados-snaps-few-objects.yaml"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados_loadgenmix.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados_loadgenmix.yaml
deleted file mode 100644
index b1c6791..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados_loadgenmix.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-  - workunit:
-      clients:
-        client.1:
-        - rados/load-gen-mix.sh
-  - print: "**** done 7-final-workload/rados_loadgenmix.yaml"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados_mon_thrash.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados_mon_thrash.yaml
deleted file mode 100644
index 807afb9..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rados_mon_thrash.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-   - sequential:
-      - mon_thrash:
-          revive_delay: 20
-          thrash_delay: 1
-      - workunit:
-          branch: jewel
-          clients:
-            client.1:
-            - rados/test-upgrade-v11.0.0.sh
-      - print: "**** done rados/test-upgrade-v11.0.0.sh from 7-final-workload"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rbd_cls.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rbd_cls.yaml
deleted file mode 100644
index 973c438..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rbd_cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.1:
-      - cls/test_cls_rbd.sh
-- print: "**** done 7-final-workload/rbd_cls.yaml"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rbd_import_export.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rbd_import_export.yaml
deleted file mode 100644
index d8116a9..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rbd_import_export.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- workunit:
-     clients:
-        client.1:
-        - rbd/import_export.sh
-     env:
-        RBD_CREATE_ARGS: --new-format
-- print: "**** done rbd/import_export.sh from 7-final-workload"
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rgw_s3tests.yaml b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rgw_s3tests.yaml
deleted file mode 100644
index f1cf2de..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/9-final-workload/rgw_s3tests.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- rgw: [client.1]
-- s3tests:
-    client.1:
-      rgw_server: client.1
-- print: "**** done rgw_server from 7-final-workload"
-overrides:
-  ceph:
-    conf:
-      client:
-        rgw lc debug interval: 10
diff --git a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/distros b/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/distros
deleted file mode 120000
index ca99fee..0000000
--- a/src/ceph/qa/suites/upgrade/hammer-jewel-x/parallel/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../distros/supported/
\ No newline at end of file