From 8265f0d8e852c1657aaacd0fa0aabfc2ca682aeb Mon Sep 17 00:00:00 2001 From: tamil Date: Tue, 30 Sep 2014 17:21:20 -0700 Subject: [PATCH] remove dumpling-firefly-giant as dumpling-firefly-x covers this test Signed-off-by: tamil --- .../upgrade/dumpling-firefly-giant/parallel/% | 0 .../parallel/0-cluster/start.yaml | 19 --------- .../parallel/1-dumpling-install/dumpling.yaml | 9 ----- .../parallel/2-dumpling-workload/+ | 0 .../2-dumpling-workload/rados_api.yaml | 9 ----- .../2-dumpling-workload/test_rbd_api.yaml | 8 ---- .../parallel/3-firefly-upgrade/firefly.yaml | 18 --------- .../parallel/4-firefly-workload/+ | 0 .../4-firefly-workload/rados_loadgenbig.yaml | 8 ---- .../4-firefly-workload/test_rbd_python.yaml | 8 ---- .../5-upgrade-to-giant/upgrade-by-daemon.yaml | 40 ------------------- .../5-upgrade-to-giant/upgrade-by-type.yaml | 40 ------------------- .../upgrade-only-client.yaml | 8 ---- .../parallel/6-giant-workload/+ | 0 .../ec-rados-plugin=jerasure-k=3-m=1.yaml | 1 - .../rados-snaps-few-objects.yaml | 12 ------ .../6-giant-workload/rados_loadgenmix.yaml | 5 --- .../6-giant-workload/rados_mon_thrash.yaml | 10 ----- .../parallel/6-giant-workload/rbd_cls.yaml | 6 --- .../6-giant-workload/rbd_import_export.yaml | 7 ---- .../6-giant-workload/rgw_s3tests.yaml | 5 --- .../parallel/6-giant-workload/rgw_swift.yaml | 6 --- .../dumpling-firefly-giant/parallel/distros | 1 - 23 files changed, 220 deletions(-) delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/% delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/0-cluster/start.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/1-dumpling-install/dumpling.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/+ delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/rados_api.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/2-dumpling-workload/test_rbd_api.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/3-firefly-upgrade/firefly.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/+ delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/rados_loadgenbig.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/4-firefly-workload/test_rbd_python.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-daemon.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-by-type.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-only-client.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/+ delete mode 120000 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados-snaps-few-objects.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_loadgenmix.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rados_mon_thrash.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_cls.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rbd_import_export.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rgw_s3tests.yaml delete mode 100644 suites/upgrade/dumpling-firefly-giant/parallel/6-giant-workload/rgw_swift.yaml delete mode 120000 suites/upgrade/dumpling-firefly-giant/parallel/distros diff --git a/suites/upgrade/dumpling-firefly-giant/parallel/% b/suites/upgrade/dumpling-firefly-giant/parallel/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 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 e3d7f85f9ffad..0000000000000 --- 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 6396b48a36b22..0000000000000 --- 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 e69de29bb2d1d..0000000000000 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 5138ec7ca8acf..0000000000000 --- 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 6a8918e7ed99a..0000000000000 --- 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 7a9bb3666b8d9..0000000000000 --- 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 e69de29bb2d1d..0000000000000 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 a1ce588794a7e..0000000000000 --- 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 f91e860f5932a..0000000000000 --- 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 d7d8c84cf47dc..0000000000000 --- 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 ce22c04a61a9b..0000000000000 --- 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/5-upgrade-to-giant/upgrade-only-client.yaml b/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-only-client.yaml deleted file mode 100644 index 684d5993e04ae..0000000000000 --- a/suites/upgrade/dumpling-firefly-giant/parallel/5-upgrade-to-giant/upgrade-only-client.yaml +++ /dev/null @@ -1,8 +0,0 @@ -upgrade-sequence: - sequential: - - install.upgrade: - client.0: - branch: giant - - print: "**** done install.upgrade client.0 to giant" - - sleep: - duration: 60 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 e69de29bb2d1d..0000000000000 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 4b9d9a44a245d..0000000000000 --- 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 bf85020d8d937..0000000000000 --- 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 879b7b6d1898d..0000000000000 --- 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 5c4c6297cfe35..0000000000000 --- 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 908b79e869ac0..0000000000000 --- 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 a7ce2141ee59b..0000000000000 --- 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 22c3a3f821a3c..0000000000000 --- 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 0ab9febd2fc00..0000000000000 --- 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 ca99fee94fa84..0000000000000 --- a/suites/upgrade/dumpling-firefly-giant/parallel/distros +++ /dev/null @@ -1 +0,0 @@ -../../../../distros/supported/ \ No newline at end of file -- 2.39.5