upgrade/hammer-x: remove

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

diff --git a/suites/upgrade/hammer-x/f-h-x-offline/% b/suites/upgrade/hammer-x/f-h-x-offline/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/hammer-x/f-h-x-offline/0-install.yaml b/suites/upgrade/hammer-x/f-h-x-offline/0-install.yaml
deleted file mode 100644 (file)
index 1eb39e4..0000000
--- a/suites/upgrade/hammer-x/f-h-x-offline/0-install.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-roles:
-- [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, client.0]
-tasks:
-- install:
-    branch: firefly
-- ceph:
-    fs: xfs
-    log-whitelist:
-    - reached quota

diff --git a/suites/upgrade/hammer-x/f-h-x-offline/1-pre.yaml b/suites/upgrade/hammer-x/f-h-x-offline/1-pre.yaml
deleted file mode 100644 (file)
index fe6c376..0000000
--- a/suites/upgrade/hammer-x/f-h-x-offline/1-pre.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    branch: firefly
-    clients:
-      client.0:
-        - rados/test.sh

diff --git a/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml b/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml
deleted file mode 100644 (file)
index 13eaee1..0000000
--- a/suites/upgrade/hammer-x/f-h-x-offline/2-upgrade.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-tasks:
-- ceph.stop: [mon.a, mon.b, mon.c]
-- ceph.stop: [osd.0, osd.1, osd.2]
-- install.upgrade:
-    mon.a:
-- ceph.restart:
-    daemons: [mon.a, mon.b, mon.c]
-    wait-for-healthy: false
-    wait-for-osds-up: false
-- exec:
-    mon.a:
-      - ceph osd down 0 1 2
-- ceph.restart: [osd.0, osd.1, osd.2]
-- sleep:
-    duration: 10

diff --git a/suites/upgrade/hammer-x/f-h-x-offline/3-infernalis.yaml b/suites/upgrade/hammer-x/f-h-x-offline/3-infernalis.yaml
deleted file mode 120000 (symlink)
index 0465c11..0000000
--- a/suites/upgrade/hammer-x/f-h-x-offline/3-infernalis.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../releases/infernalis.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/f-h-x-offline/4-after.yaml b/suites/upgrade/hammer-x/f-h-x-offline/4-after.yaml
deleted file mode 100644 (file)
index cd11ae6..0000000
--- a/suites/upgrade/hammer-x/f-h-x-offline/4-after.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rados/test.sh

diff --git a/suites/upgrade/hammer-x/f-h-x-offline/README b/suites/upgrade/hammer-x/f-h-x-offline/README
deleted file mode 100644 (file)
index 98153e0..0000000
--- a/suites/upgrade/hammer-x/f-h-x-offline/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Verify that we can upgrade straight from firefly to x without ever installing
-hammer.
-
-This would be an offline upgrade, though.. all osds have to be restarted!

diff --git a/suites/upgrade/hammer-x/f-h-x-offline/distros b/suites/upgrade/hammer-x/f-h-x-offline/distros
deleted file mode 120000 (symlink)
index ca99fee..0000000
--- a/suites/upgrade/hammer-x/f-h-x-offline/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../distros/supported/
\ No newline at end of file

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

diff --git a/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml b/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml
deleted file mode 100644 (file)
index 0d8f850..0000000
--- a/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-roles:
-- - mon.a
-  - mds.a
-  - osd.0
-  - osd.1
-- - mon.b
-  - mon.c
-  - osd.2
-  - osd.3
-- - client.0
-  - client.1
-  - client.2
-  - client.3
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub mismatch
-    - ScrubResult
-    - failed to encode map
-    - wrongly marked me down
-    - soft lockup
-    - detected stalls on CPUs
-    conf:
-      mon:
-        mon warn on legacy crush tunables: false

diff --git a/suites/upgrade/hammer-x/parallel/0-tz-eastern.yaml b/suites/upgrade/hammer-x/parallel/0-tz-eastern.yaml
deleted file mode 120000 (symlink)
index f7ee09f..0000000
--- a/suites/upgrade/hammer-x/parallel/0-tz-eastern.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../timezone/eastern.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml b/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml
deleted file mode 100644 (file)
index e5bf1fc..0000000
--- a/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-tasks:
-- install:
-    branch: hammer
-- print: "**** done installing hammer"
-- ceph:
-    fs: xfs
-- print: "**** done ceph"
-- install.upgrade:
-    mon.a:
-    mon.b:
-- print: "**** done install.upgrade mon.a and mon.b"
-- parallel:
-    - workload
-    - upgrade-sequence
-- print: "**** done parallel"
-- install.upgrade:
-    client.0:
\ No newline at end of file

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

diff --git a/suites/upgrade/hammer-x/parallel/2-workload/blogbench.yaml b/suites/upgrade/hammer-x/parallel/2-workload/blogbench.yaml
deleted file mode 100644 (file)
index 021fcc6..0000000
--- a/suites/upgrade/hammer-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/suites/upgrade/hammer-x/parallel/2-workload/ec-rados-default.yaml b/suites/upgrade/hammer-x/parallel/2-workload/ec-rados-default.yaml
deleted file mode 100644 (file)
index e4f3ee1..0000000
--- a/suites/upgrade/hammer-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/suites/upgrade/hammer-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/hammer-x/parallel/2-workload/rados_api.yaml
deleted file mode 100644 (file)
index d86c2d2..0000000
--- a/suites/upgrade/hammer-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/suites/upgrade/hammer-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/hammer-x/parallel/2-workload/rados_loadgenbig.yaml
deleted file mode 100644 (file)
index 50ba808..0000000
--- a/suites/upgrade/hammer-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/suites/upgrade/hammer-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/hammer-x/parallel/2-workload/test_rbd_api.yaml
deleted file mode 100644 (file)
index 997f7ba..0000000
--- a/suites/upgrade/hammer-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/suites/upgrade/hammer-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/hammer-x/parallel/2-workload/test_rbd_python.yaml
deleted file mode 100644 (file)
index d1046da..0000000
--- a/suites/upgrade/hammer-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/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
deleted file mode 100644 (file)
index fe36f91..0000000
--- a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
-   - print: "**** done ceph.restart all"

diff --git a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
deleted file mode 100644 (file)
index 8ad4e0a..0000000
--- a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-upgrade-sequence:
-   sequential:
-   - 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
-   - ceph.restart: [mds.a]
-   - 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: true
-   - sleep:
-       duration: 60
-   - ceph.restart:
-       daemons: [osd.2, osd.3]
-       wait-for-healthy: true
-   - sleep:
-       duration: 60

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

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

diff --git a/suites/upgrade/hammer-x/parallel/5-final-workload/blogbench.yaml b/suites/upgrade/hammer-x/parallel/5-final-workload/blogbench.yaml
deleted file mode 100644 (file)
index d2629c0..0000000
--- a/suites/upgrade/hammer-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 5-final-workload"
-  - workunit:
-      clients:
-         client.3:
-          - suites/blogbench.sh
-  - print: "**** done suites/blogbench.sh 5-final-workload"

diff --git a/suites/upgrade/hammer-x/parallel/5-final-workload/rados-snaps-few-objects.yaml b/suites/upgrade/hammer-x/parallel/5-final-workload/rados-snaps-few-objects.yaml
deleted file mode 100644 (file)
index 505c16a..0000000
--- a/suites/upgrade/hammer-x/parallel/5-final-workload/rados-snaps-few-objects.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-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/suites/upgrade/hammer-x/parallel/5-final-workload/rados_loadgenmix.yaml b/suites/upgrade/hammer-x/parallel/5-final-workload/rados_loadgenmix.yaml
deleted file mode 100644 (file)
index d4a8006..0000000
--- a/suites/upgrade/hammer-x/parallel/5-final-workload/rados_loadgenmix.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - rados/load-gen-mix.sh
-  - print: "**** done rados/load-gen-mix.sh 4-final-workload"

diff --git a/suites/upgrade/hammer-x/parallel/5-final-workload/rados_mon_thrash.yaml b/suites/upgrade/hammer-x/parallel/5-final-workload/rados_mon_thrash.yaml
deleted file mode 100644 (file)
index cc71c5c..0000000
--- a/suites/upgrade/hammer-x/parallel/5-final-workload/rados_mon_thrash.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-      - reached quota
-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/suites/upgrade/hammer-x/parallel/5-final-workload/rbd_cls.yaml b/suites/upgrade/hammer-x/parallel/5-final-workload/rbd_cls.yaml
deleted file mode 100644 (file)
index ed75230..0000000
--- a/suites/upgrade/hammer-x/parallel/5-final-workload/rbd_cls.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - cls/test_cls_rbd.sh
-  - print: "**** done cls/test_cls_rbd.sh 4-final-workload"

diff --git a/suites/upgrade/hammer-x/parallel/5-final-workload/rbd_import_export.yaml b/suites/upgrade/hammer-x/parallel/5-final-workload/rbd_import_export.yaml
deleted file mode 100644 (file)
index 2c66c28..0000000
--- a/suites/upgrade/hammer-x/parallel/5-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 4-final-workload"

diff --git a/suites/upgrade/hammer-x/parallel/5-final-workload/rgw_swift.yaml b/suites/upgrade/hammer-x/parallel/5-final-workload/rgw_swift.yaml
deleted file mode 100644 (file)
index 01f2932..0000000
--- a/suites/upgrade/hammer-x/parallel/5-final-workload/rgw_swift.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-overrides:
-  rgw:
-    frontend: civetweb
-tasks:
-  - rgw: [client.1]
-  - print: "**** done rgw 4-final-workload"
-  - swift:
-      client.1:
-        rgw_server: client.1
-  - print: "**** done swift 4-final-workload"

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

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

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

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/0-tz-eastern.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/0-tz-eastern.yaml
deleted file mode 120000 (symlink)
index f7ee09f..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/0-tz-eastern.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../timezone/eastern.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/0-x86_64.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/0-x86_64.yaml
deleted file mode 100644 (file)
index c2409f5..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/0-x86_64.yaml
+++ /dev/null
@@ -1 +0,0 @@
-arch: x86_64

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

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

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/3-thrash/default.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/3-thrash/default.yaml
deleted file mode 100644 (file)
index 0818845..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/3-thrash/default.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-overrides:
-  ceph:
-    fs: xfs
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-    - failed to encode map e
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-    min_in: 4
-- print: "**** done thrashosds 3-thrash"

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

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/5-workload/ec-rados-default.yaml
deleted file mode 120000 (symlink)
index a8a0ae6..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/5-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/hammer-x/stress-split-erasure-code-x86_64/6-next-mon b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon
deleted file mode 120000 (symlink)
index 0f00e43..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/6-next-mon
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/6-next-mon
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/8-next-mon b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/8-next-mon
deleted file mode 120000 (symlink)
index 726c6a4..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/8-next-mon
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/8-next-mon
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml
deleted file mode 120000 (symlink)
index 79888dd..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code-x86_64/9-workload/ec-rados-plugin=isa-k=2-m=1.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../erasure-code/ec-rados-plugin=isa-k=2-m=1.yaml
\ No newline at end of file

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

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/0-cluster b/suites/upgrade/hammer-x/stress-split-erasure-code/0-cluster
deleted file mode 120000 (symlink)
index 6dceffa..0000000
--- a/suites/upgrade/hammer-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/suites/upgrade/hammer-x/stress-split-erasure-code/0-tz-eastern.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code/0-tz-eastern.yaml
deleted file mode 120000 (symlink)
index f7ee09f..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code/0-tz-eastern.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../timezone/eastern.yaml
\ No newline at end of file

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

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/2-partial-upgrade b/suites/upgrade/hammer-x/stress-split-erasure-code/2-partial-upgrade
deleted file mode 120000 (symlink)
index c3a4e2c..0000000
--- a/suites/upgrade/hammer-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/suites/upgrade/hammer-x/stress-split-erasure-code/3-thrash/default.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code/3-thrash/default.yaml
deleted file mode 100644 (file)
index 01eb7fb..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code/3-thrash/default.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    fs: xfs
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-    - failed to encode map e
-    - soft lockup
-    - detected stalls on CPUs
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-    min_in: 4
-- print: "**** done thrashosds 3-thrash"

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

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml
deleted file mode 120000 (symlink)
index a8a0ae6..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code/5-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/hammer-x/stress-split-erasure-code/6-next-mon b/suites/upgrade/hammer-x/stress-split-erasure-code/6-next-mon
deleted file mode 120000 (symlink)
index 0f00e43..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code/6-next-mon
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/6-next-mon
\ No newline at end of file

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

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/9-workload/ec-no-shec.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code/9-workload/ec-no-shec.yaml
deleted file mode 100644 (file)
index 7be49a3..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code/9-workload/ec-no-shec.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# The shec plugin cannot be used because some OSD are not upgraded
-# yet and would crash.
-#
-tasks: 
-- exec:
-    mon.a:
-      - |-
-        sudo ceph osd erasure-code-profile set profile-shec k=2 m=1 c=1 plugin=shec 2>&1 | grep "unsupported by"

diff --git a/suites/upgrade/hammer-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/upgrade/hammer-x/stress-split-erasure-code/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
deleted file mode 120000 (symlink)
index 4b9d9a4..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code/9-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/hammer-x/stress-split-erasure-code/distros b/suites/upgrade/hammer-x/stress-split-erasure-code/distros
deleted file mode 120000 (symlink)
index 8d43097..0000000
--- a/suites/upgrade/hammer-x/stress-split-erasure-code/distros
+++ /dev/null
@@ -1 +0,0 @@
-../stress-split/distros
\ No newline at end of file

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

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

diff --git a/suites/upgrade/hammer-x/stress-split/0-cluster/openstack.yaml b/suites/upgrade/hammer-x/stress-split/0-cluster/openstack.yaml
deleted file mode 100644 (file)
index 45e60ef..0000000
--- a/suites/upgrade/hammer-x/stress-split/0-cluster/openstack.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-openstack:
-  - machine:
-      disk: 40 # GB

diff --git a/suites/upgrade/hammer-x/stress-split/0-cluster/start.yaml b/suites/upgrade/hammer-x/stress-split/0-cluster/start.yaml
deleted file mode 100644 (file)
index a7dbead..0000000
--- a/suites/upgrade/hammer-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
-  - mon.c
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-- - osd.3
-  - osd.4
-  - osd.5
-- - client.0

diff --git a/suites/upgrade/hammer-x/stress-split/0-tz-eastern.yaml b/suites/upgrade/hammer-x/stress-split/0-tz-eastern.yaml
deleted file mode 120000 (symlink)
index f7ee09f..0000000
--- a/suites/upgrade/hammer-x/stress-split/0-tz-eastern.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../timezone/eastern.yaml
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/stress-split/1-hammer-install/hammer.yaml b/suites/upgrade/hammer-x/stress-split/1-hammer-install/hammer.yaml
deleted file mode 100644 (file)
index 6c2470d..0000000
--- a/suites/upgrade/hammer-x/stress-split/1-hammer-install/hammer.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    branch: hammer
-- print: "**** done install hammer"
-- ceph:
-    fs: xfs
-- print: "**** done ceph"

diff --git a/suites/upgrade/hammer-x/stress-split/2-partial-upgrade/firsthalf.yaml b/suites/upgrade/hammer-x/stress-split/2-partial-upgrade/firsthalf.yaml
deleted file mode 100644 (file)
index e372cb0..0000000
--- a/suites/upgrade/hammer-x/stress-split/2-partial-upgrade/firsthalf.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install.upgrade:
-    osd.0: 
-- print: "**** done install.upgrade osd.0"
-- ceph.restart:
-    daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5]
-- print: "**** done ceph.restart 1st half"

diff --git a/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml b/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml
deleted file mode 100644 (file)
index 7ff0aa7..0000000
--- a/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-    - failed to encode map e
-    - soft lockup
-    - detected stalls on CPUs
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-- print: "**** done thrashosds 3-thrash"

diff --git a/suites/upgrade/hammer-x/stress-split/4-mon/mona.yaml b/suites/upgrade/hammer-x/stress-split/4-mon/mona.yaml
deleted file mode 100644 (file)
index 7c75c10..0000000
--- a/suites/upgrade/hammer-x/stress-split/4-mon/mona.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.a]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.a"

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

diff --git a/suites/upgrade/hammer-x/stress-split/5-workload/rbd-cls.yaml b/suites/upgrade/hammer-x/stress-split/5-workload/rbd-cls.yaml
deleted file mode 100644 (file)
index 1bcd1b8..0000000
--- a/suites/upgrade/hammer-x/stress-split/5-workload/rbd-cls.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    branch: hammer
-    clients:
-      client.0:
-        - cls/test_cls_rbd.sh
-- print: "**** done cls/test_cls_rbd.sh 5-workload"

diff --git a/suites/upgrade/hammer-x/stress-split/5-workload/rbd-import-export.yaml b/suites/upgrade/hammer-x/stress-split/5-workload/rbd-import-export.yaml
deleted file mode 100644 (file)
index 882d979..0000000
--- a/suites/upgrade/hammer-x/stress-split/5-workload/rbd-import-export.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- workunit:
-    branch: hammer
-    clients:
-      client.0:
-        - rbd/import_export.sh
-    env:
-      RBD_CREATE_ARGS: --new-format
-- print: "**** done rbd/import_export.sh 5-workload"

diff --git a/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml b/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml
deleted file mode 100644 (file)
index 2fe02b3..0000000
--- a/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-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/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml b/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index 9f8b7bb..0000000
--- a/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-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/suites/upgrade/hammer-x/stress-split/6-next-mon/monb.yaml b/suites/upgrade/hammer-x/stress-split/6-next-mon/monb.yaml
deleted file mode 100644 (file)
index 22e87c7..0000000
--- a/suites/upgrade/hammer-x/stress-split/6-next-mon/monb.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.b]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.b 6-next-mon"

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

diff --git a/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml b/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml
deleted file mode 100644 (file)
index a940015..0000000
--- a/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-tasks:
-- 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/suites/upgrade/hammer-x/stress-split/7-workload/rbd_api.yaml b/suites/upgrade/hammer-x/stress-split/7-workload/rbd_api.yaml
deleted file mode 100644 (file)
index 19a24c2..0000000
--- a/suites/upgrade/hammer-x/stress-split/7-workload/rbd_api.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-     branch: hammer
-     clients:
-        client.0:
-           - rbd/test_librbd.sh
-- print: "**** done rbd/test_librbd.sh 7-workload"

diff --git a/suites/upgrade/hammer-x/stress-split/8-next-mon/monc.yaml b/suites/upgrade/hammer-x/stress-split/8-next-mon/monc.yaml
deleted file mode 100644 (file)
index 6125368..0000000
--- a/suites/upgrade/hammer-x/stress-split/8-next-mon/monc.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.c]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.c 8-next-mon"
-- ceph.wait_for_mon_quorum: [a, b, c]
-- print: "**** done wait_for_mon_quorum 8-next-mon"

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

diff --git a/suites/upgrade/hammer-x/stress-split/9-workload/rbd-python.yaml b/suites/upgrade/hammer-x/stress-split/9-workload/rbd-python.yaml
deleted file mode 100644 (file)
index 0ea5639..0000000
--- a/suites/upgrade/hammer-x/stress-split/9-workload/rbd-python.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- workunit:
-    branch: hammer
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh
-- print: "**** done rbd/test_librbd_python.sh 9-workload"

diff --git a/suites/upgrade/hammer-x/stress-split/9-workload/rgw-swift.yaml b/suites/upgrade/hammer-x/stress-split/9-workload/rgw-swift.yaml
deleted file mode 100644 (file)
index 8f14160..0000000
--- a/suites/upgrade/hammer-x/stress-split/9-workload/rgw-swift.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- rgw: 
-    client.0:
-    default_idle_timeout: 300
-- print: "**** done rgw 9-workload"
-- swift:
-    client.0:
-      rgw_server: client.0
-- print: "**** done swift 9-workload"

diff --git a/suites/upgrade/hammer-x/stress-split/9-workload/snaps-many-objects.yaml b/suites/upgrade/hammer-x/stress-split/9-workload/snaps-many-objects.yaml
deleted file mode 100644 (file)
index 39b44f6..0000000
--- a/suites/upgrade/hammer-x/stress-split/9-workload/snaps-many-objects.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-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/suites/upgrade/hammer-x/stress-split/distros b/suites/upgrade/hammer-x/stress-split/distros
deleted file mode 120000 (symlink)
index 79010c3..0000000
--- a/suites/upgrade/hammer-x/stress-split/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../distros/supported
\ No newline at end of file

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

diff --git a/suites/upgrade/hammer-x/tiering/0-cluster/start.yaml b/suites/upgrade/hammer-x/tiering/0-cluster/start.yaml
deleted file mode 100644 (file)
index ce6e191..0000000
--- a/suites/upgrade/hammer-x/tiering/0-cluster/start.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-roles:
-- - mon.a
-  - mon.b
-  - mon.c
-  - mds.a
-  - osd.0
-  - osd.1
-- - osd.2
-  - osd.3
-- - client.0
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub mismatch
-    - ScrubResult
-    - failed to encode map
-    - wrongly marked me down
-    - soft lockup
-    - detected stalls on CPUs
-    conf:
-      mon:
-        mon warn on legacy crush tunables: false

diff --git a/suites/upgrade/hammer-x/tiering/1-hammer-install/hammer.yaml b/suites/upgrade/hammer-x/tiering/1-hammer-install/hammer.yaml
deleted file mode 100644 (file)
index 6c2470d..0000000
--- a/suites/upgrade/hammer-x/tiering/1-hammer-install/hammer.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- install:
-    branch: hammer
-- print: "**** done install hammer"
-- ceph:
-    fs: xfs
-- print: "**** done ceph"

diff --git a/suites/upgrade/hammer-x/tiering/2-setup-cache-tiering/% b/suites/upgrade/hammer-x/tiering/2-setup-cache-tiering/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/hammer-x/tiering/2-setup-cache-tiering/0-create-base-tier/create-ec-pool.yaml b/suites/upgrade/hammer-x/tiering/2-setup-cache-tiering/0-create-base-tier/create-ec-pool.yaml
deleted file mode 100644 (file)
index 24e6a33..0000000
--- a/suites/upgrade/hammer-x/tiering/2-setup-cache-tiering/0-create-base-tier/create-ec-pool.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - ceph osd erasure-code-profile set teuthologyprofile ruleset-failure-domain=osd k=2 m=1
-      - ceph osd pool create base-pool 4 4 erasure teuthologyprofile

diff --git a/suites/upgrade/hammer-x/tiering/2-setup-cache-tiering/0-create-base-tier/create-replicated-pool.yaml b/suites/upgrade/hammer-x/tiering/2-setup-cache-tiering/0-create-base-tier/create-replicated-pool.yaml
deleted file mode 100644 (file)
index 5a13581..0000000
--- a/suites/upgrade/hammer-x/tiering/2-setup-cache-tiering/0-create-base-tier/create-replicated-pool.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - ceph osd pool create base-pool 4

diff --git a/suites/upgrade/hammer-x/tiering/2-setup-cache-tiering/1-create-cache-tier/create-cache-tier.yaml b/suites/upgrade/hammer-x/tiering/2-setup-cache-tiering/1-create-cache-tier/create-cache-tier.yaml
deleted file mode 100644 (file)
index 8933621..0000000
--- a/suites/upgrade/hammer-x/tiering/2-setup-cache-tiering/1-create-cache-tier/create-cache-tier.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - ceph osd pool create cache-pool 4
-      - ceph osd tier add base-pool cache-pool
-      - ceph osd tier cache-mode cache-pool writeback
-      - ceph osd tier set-overlay base-pool cache-pool
-      - ceph osd pool set cache-pool hit_set_type bloom
-      - ceph osd pool set cache-pool hit_set_count 8
-      - ceph osd pool set cache-pool hit_set_period 5

diff --git a/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml b/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml
deleted file mode 100644 (file)
index e43b6b6..0000000
--- a/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-tasks:
-- parallel:
-  - workload-when-upgrading
-  - upgrade-sequence
-- print: "**** done upgrade"
-
-workload-when-upgrading:
-  sequential:
-  - rados:
-      clients: [client.0]
-      ops: 4000
-      objects: 50
-      pools: [base-pool]
-      write_append_excl: false
-      op_weights:
-        read: 100
-        write: 0
-        append: 100
-        delete: 50
-        copy_from: 50
-        setattr: 25
-        rmattr: 25
-  - print: "**** done rados when upgrading"
-
-upgrade-sequence:
-  sequential:
-  - upgrade-first-half
-  - flip-but-fail
-  - upgrade-second-half
-
-upgrade-first-half:
-  sequential:
-  - install.upgrade:
-      mon.a:
-  - print: "**** done install.upgrade mon.{a,b,c} and osd.{0,1}"
-  - ceph.restart:
-      daemons: [mon.a]
-      wait-for-healthy: true
-  - sleep:
-      duration: 60
-  - ceph.restart:
-      daemons: [osd.0]
-      wait-for-healthy: true
-  - sleep:
-      duration: 60
-  - ceph.restart:
-      daemons: [osd.1]
-      wait-for-healthy: true
-  - sleep:
-      duration: 60
-  - ceph.restart:
-      daemons: [mon.b]
-      wait-for-healthy: true
-  - sleep:
-      duration: 60
-  - ceph.restart:
-      daemons: [mon.c]
-      wait-for-healthy: true
-  - sleep:
-      duration: 60
-
-upgrade-second-half:
-  sequential:
-  - install.upgrade:
-      osd.2:
-  - print: "**** done install.upgrade osd.{2,3}"
-  - ceph.restart:
-      daemons: [osd.2]
-      wait-for-healthy: true
-  - sleep:
-      duration: 60
-  - ceph.restart:
-      daemons: [osd.3]
-      wait-for-healthy: true
-  - sleep:
-      duration: 60
-
-flip-but-fail:
-  sequential:
-  - exec:
-      mon.a:
-        - |-
-          ceph osd set sortbitwise 2>&1 | grep "not all up OSDs have OSD_BITWISE_HOBJ_SORT feature"
-  - print: "**** done flip-but-fail"

diff --git a/suites/upgrade/hammer-x/tiering/4-finish-upgrade/flip-success.yaml b/suites/upgrade/hammer-x/tiering/4-finish-upgrade/flip-success.yaml
deleted file mode 100644 (file)
index 9482ea5..0000000
--- a/suites/upgrade/hammer-x/tiering/4-finish-upgrade/flip-success.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-tasks:
-- parallel:
-    - workload-2
-    - flip-and-success
-
-workload-2:
-  sequential:
-  - rados:
-      clients: [client.0]
-      ops: 1000
-      objects: 50
-      pools: [base-pool]
-      op_weights:
-        read: 100
-        write: 100
-        delete: 50
-        snap_create: 50
-        snap_remove: 50
-        rollback: 50
-  - print: "**** done rados after upgrading"
-
-flip-and-success:
-  sequential:
-    - exec:
-        client.0:
-          - ceph osd set sortbitwise
-          - ceph osd pool set cache-pool use_gmt_hitset true
-    - print: "**** done flip-and-success"

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

diff --git a/suites/upgrade/hammer-x/v0-94-4-stop/+ b/suites/upgrade/hammer-x/v0-94-4-stop/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/hammer-x/v0-94-4-stop/distros b/suites/upgrade/hammer-x/v0-94-4-stop/distros
deleted file mode 120000 (symlink)
index ca99fee..0000000
--- a/suites/upgrade/hammer-x/v0-94-4-stop/distros
+++ /dev/null
@@ -1 +0,0 @@
-../../../../distros/supported/
\ No newline at end of file

diff --git a/suites/upgrade/hammer-x/v0-94-4-stop/ignore.yaml b/suites/upgrade/hammer-x/v0-94-4-stop/ignore.yaml
deleted file mode 100644 (file)
index be2507f..0000000
--- a/suites/upgrade/hammer-x/v0-94-4-stop/ignore.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - scrub mismatch
-    - ScrubResult
-    - failed to encode map
-    conf:
-      mon:
-        mon warn on legacy crush tunables: false

diff --git a/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml b/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml
deleted file mode 100644 (file)
index 4377198..0000000
--- a/suites/upgrade/hammer-x/v0-94-4-stop/v0-94-4-stop.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# Test the expected behavior of the
-#
-#    CEPH_FEATURE_HAMMER_0_94_4
-#
-# feature that forbids a cluster with a mix of
-# OSD < v0.94.4 and OSD >= v0.94.4
-#
-roles:
-- - mon.a
-  - osd.0
-  - osd.1
-- - osd.2
-tasks:
-- print: "**** Install version lower than v0.94.4"
-- install:
-    tag: v0.94.3
-- ceph:
-    fs: xfs
-
-- print: "*** Upgrade the target that runs osd.0 and osd.1 to -x while the target that runs osd.2 stays v0.94.3"
-- install.upgrade:
-    osd.0:
-
-- print: "*** Restart the mon.a so that it is post-hammer v0.94.4 and implements the CEPH_FEATURE_HAMMER_0_94_4 feature"
-- ceph.restart:
-    daemons: [mon.a]
-
-- print: "*** Verify that osd.0 cannot restart because osd.1 and osd.2 are still < v0.94.4"
-- ceph.restart:
-    daemons: [osd.0]
-    wait-for-healthy: false
-- exec:
-    osd.0:
-      - |-
-        set -x
-        success=false
-        for delay in 1 2 4 8 16 32 64 128 256 512 1024 ; do 
-          if ceph daemon osd.0 log flush ; then
-            if grep "one or more pre-v0.94.4 hammer" /var/log/ceph/ceph-osd.0.log ; then
-              success=true
-              break
-            fi
-          fi
-          sleep $delay
-        done
-        $success || exit 1
-
-- print: "*** Stop all OSDs and restart osd.0 and osd.1 which are >= v0.94.4"
-- ceph.stop:
-    daemons: [osd.0, osd.1, osd.2]
-- exec:
-    mon.a:
-      - |-
-        set -x
-        ceph osd down osd.0
-        ceph osd down osd.1
-        ceph osd down osd.2
-- ceph.restart:
-    daemons: [osd.0, osd.1]
-    wait-for-healthy: false
-- exec:
-    mon.a:
-      - |-
-        set -x
-        success=false
-        for delay in 1 2 4 8 16 32 64 128 256 512 1024 ; do 
-          if ceph osd dump | grep 'osd.1 up' && ceph osd dump | grep 'osd.0 up' ; then 
-            success=true
-            break
-          fi
-          ceph osd dump
-          sleep $delay
-        done
-        $success || exit 1
-        ceph osd dump | grep 'osd.2 down' || exit 1
-          
-- print: "*** Verify that osd.2 cannot restart because it is < v0.94.4 and all other OSDs are >= v0.94.4"
-- ceph.restart:
-    daemons: [osd.2]
-    wait-for-healthy: false
-- exec:
-    mon.a:
-      - |-
-        set -x
-        success=false
-        for delay in 1 2 4 8 16 32 64 128 256 512 1024 ; do 
-          ceph daemon mon.a log flush
-          if grep "disallowing boot of pre-hammer v0.94.4 OSD" /var/log/ceph/*.log ; then
-            success=true
-            break
-          fi
-          sleep $delay
-          ceph osd dump
-        done
-        $success || exit 1
-
-- print: "*** Upgrade the target that runs osd.2 to -x and verify the cluster is back to being healthy"
-- install.upgrade:
-    osd.2:
-- ceph.restart:
-    daemons: [osd.2]