Revert "Added singleton hammer-x test to address #12625"

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

diff --git a/suites/rados/upgrade/hammer-x-singleton/0-cluster/start.yaml b/suites/rados/upgrade/hammer-x-singleton/0-cluster/start.yaml
deleted file mode 100644 (file)
index a7dbead..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/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/rados/upgrade/hammer-x-singleton/1-hammer-install/hammer.yaml b/suites/rados/upgrade/hammer-x-singleton/1-hammer-install/hammer.yaml
deleted file mode 100644 (file)
index 6c2470d..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/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/rados/upgrade/hammer-x-singleton/2-partial-upgrade/firsthalf.yaml b/suites/rados/upgrade/hammer-x-singleton/2-partial-upgrade/firsthalf.yaml
deleted file mode 100644 (file)
index 2490f76..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/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]
-- print: "**** done ceph.restart 1st half"

diff --git a/suites/rados/upgrade/hammer-x-singleton/3-thrash/default.yaml b/suites/rados/upgrade/hammer-x-singleton/3-thrash/default.yaml
deleted file mode 100644 (file)
index d99d0c8..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/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
-- print: "**** done thrashosds 3-thrash"

diff --git a/suites/rados/upgrade/hammer-x-singleton/4-mon/mona.yaml b/suites/rados/upgrade/hammer-x-singleton/4-mon/mona.yaml
deleted file mode 100644 (file)
index 7c75c10..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/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/rados/upgrade/hammer-x-singleton/5-workload/+ b/suites/rados/upgrade/hammer-x-singleton/5-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/rados/upgrade/hammer-x-singleton/5-workload/rbd-cls.yaml b/suites/rados/upgrade/hammer-x-singleton/5-workload/rbd-cls.yaml
deleted file mode 100644 (file)
index 1bcd1b8..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/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/rados/upgrade/hammer-x-singleton/5-workload/rbd-import-export.yaml b/suites/rados/upgrade/hammer-x-singleton/5-workload/rbd-import-export.yaml
deleted file mode 100644 (file)
index 882d979..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/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/rados/upgrade/hammer-x-singleton/5-workload/readwrite.yaml b/suites/rados/upgrade/hammer-x-singleton/5-workload/readwrite.yaml
deleted file mode 100644 (file)
index 922e61f..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/5-workload/readwrite.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- 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/rados/upgrade/hammer-x-singleton/5-workload/snaps-few-objects.yaml b/suites/rados/upgrade/hammer-x-singleton/5-workload/snaps-few-objects.yaml
deleted file mode 100644 (file)
index 33c820d..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/5-workload/snaps-few-objects.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-tasks:
-- 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/rados/upgrade/hammer-x-singleton/6-next-mon/monb.yaml b/suites/rados/upgrade/hammer-x-singleton/6-next-mon/monb.yaml
deleted file mode 100644 (file)
index 22e87c7..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/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/rados/upgrade/hammer-x-singleton/7-workload/+ b/suites/rados/upgrade/hammer-x-singleton/7-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml b/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml
deleted file mode 100644 (file)
index 3d87bb1..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- radosbench:
-    clients: [client.0]
-    time: 1800
-- print: "**** done radosbench 7-workload"

diff --git a/suites/rados/upgrade/hammer-x-singleton/7-workload/rbd_api.yaml b/suites/rados/upgrade/hammer-x-singleton/7-workload/rbd_api.yaml
deleted file mode 100644 (file)
index 19a24c2..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/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/rados/upgrade/hammer-x-singleton/8-next-mon/monc.yaml b/suites/rados/upgrade/hammer-x-singleton/8-next-mon/monc.yaml
deleted file mode 100644 (file)
index 6125368..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/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/rados/upgrade/hammer-x-singleton/9-workload/+ b/suites/rados/upgrade/hammer-x-singleton/9-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/rados/upgrade/hammer-x-singleton/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/rados/upgrade/hammer-x-singleton/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
deleted file mode 100644 (file)
index 7714312..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# k=3 implies a stripe_width of 1376*3 = 4128 which is different from
-# the default value of 4096 It is also not a multiple of 1024*1024 and
-# creates situations where rounding rules during recovery becomes
-# necessary.
-#
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 50
-    ec_pool: true
-    write_append_excl: false
-    erasure_code_profile:
-      name: jerasure31profile
-      plugin: jerasure
-      k: 3
-      m: 1
-      technique: reed_sol_van
-      ruleset-failure-domain: osd
-    op_weights:
-      read: 100
-      write: 0
-      append: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50
-      copy_from: 50
-      setattr: 25
-      rmattr: 25

diff --git a/suites/rados/upgrade/hammer-x-singleton/9-workload/rbd-python.yaml b/suites/rados/upgrade/hammer-x-singleton/9-workload/rbd-python.yaml
deleted file mode 100644 (file)
index 0ea5639..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/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/rados/upgrade/hammer-x-singleton/9-workload/rgw-swift.yaml b/suites/rados/upgrade/hammer-x-singleton/9-workload/rgw-swift.yaml
deleted file mode 100644 (file)
index 8f14160..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/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/rados/upgrade/hammer-x-singleton/9-workload/snaps-many-objects.yaml b/suites/rados/upgrade/hammer-x-singleton/9-workload/snaps-many-objects.yaml
deleted file mode 100644 (file)
index 39b44f6..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/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/rados/upgrade/hammer-x-singleton/9-workload/test_cache-pool-snaps.yaml b/suites/rados/upgrade/hammer-x-singleton/9-workload/test_cache-pool-snaps.yaml
deleted file mode 100644 (file)
index 528050d..0000000
--- a/suites/rados/upgrade/hammer-x-singleton/9-workload/test_cache-pool-snaps.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-      - must scrub before tier agent can activate
-tasks:
-workunit:
-  sequential:
-    - exec:
-        client.0:
-          - ceph osd pool create base 4
-          - ceph osd pool create cache 4
-          - ceph osd tier add base cache
-          - ceph osd tier cache-mode cache writeback
-          - ceph osd tier set-overlay base cache
-          - ceph osd pool set cache hit_set_type bloom
-          - ceph osd pool set cache hit_set_count 8
-          - ceph osd pool set cache hit_set_period 3600
-          - ceph osd pool set cache target_max_objects 250
-    - rados:
-        clients: [client.0]
-        pools: [base]
-        ops: 4000
-        objects: 500
-        pool_snaps: true
-        op_weights:
-          read: 100
-          write: 100
-          delete: 50
-          copy_from: 50
-          flush: 50
-          try_flush: 50
-          evict: 50
-          snap_create: 50
-          snap_remove: 50
-          rollback: 50
-    - print: "**** done test_cache-pool-snaps 9-workload"