From 788236302add409ddbd0f13957e571fee38b58ab Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 27 Apr 2013 14:49:13 -0700 Subject: [PATCH] upgrade: reorganize the basic/rados suite Use facets instead of duplicating the test content each time. --- .../basic/tasks/upgrade_mds_mon_osd.yaml | 27 ------------------ .../basic/tasks/upgrade_mds_osd_mon.yaml | 27 ------------------ .../basic/tasks/upgrade_mon_mds_osd.yaml | 28 ------------------- .../basic/tasks/upgrade_mon_osd_mds.yaml | 27 ------------------ .../basic/tasks/upgrade_osd_mds_mon.yaml | 28 ------------------- .../basic/tasks/upgrade_osd_mon_mds.yaml | 27 ------------------ .../start.yaml} | 7 +---- .../upgrade/rados/b/upgrade_mds_mon_osd.yaml | 2 ++ .../upgrade/rados/b/upgrade_mds_osd_mon.yaml | 2 ++ .../upgrade/rados/b/upgrade_mon_mds_osd.yaml | 2 ++ .../upgrade/rados/b/upgrade_mon_osd_mds.yaml | 2 ++ .../upgrade/rados/b/upgrade_osd_mds_mon.yaml | 2 ++ .../upgrade/rados/b/upgrade_osd_mon_mds.yaml | 2 ++ suites/upgrade/rados/c/tail.yaml | 5 ++++ .../upgrade_mds_first_rados_api_python.yaml | 26 ----------------- .../upgrade_mds_first_rados_loadgen_big.yaml | 26 ----------------- .../upgrade_mon_first_rados_loadgen_big.yaml | 26 ----------------- .../upgrade_osd_first_rados_api_python.yaml | 26 ----------------- .../upgrade_osd_first_rados_loadgen_big.yaml | 26 ----------------- 19 files changed, 18 insertions(+), 300 deletions(-) delete mode 100644 suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml delete mode 100644 suites/upgrade/basic/tasks/upgrade_mds_osd_mon.yaml delete mode 100644 suites/upgrade/basic/tasks/upgrade_mon_mds_osd.yaml delete mode 100644 suites/upgrade/basic/tasks/upgrade_mon_osd_mds.yaml delete mode 100644 suites/upgrade/basic/tasks/upgrade_osd_mds_mon.yaml delete mode 100644 suites/upgrade/basic/tasks/upgrade_osd_mon_mds.yaml rename suites/upgrade/rados/{tasks/upgrade_mon_first_rados_api_python.yaml => a/start.yaml} (57%) create mode 100644 suites/upgrade/rados/b/upgrade_mds_mon_osd.yaml create mode 100644 suites/upgrade/rados/b/upgrade_mds_osd_mon.yaml create mode 100644 suites/upgrade/rados/b/upgrade_mon_mds_osd.yaml create mode 100644 suites/upgrade/rados/b/upgrade_mon_osd_mds.yaml create mode 100644 suites/upgrade/rados/b/upgrade_osd_mds_mon.yaml create mode 100644 suites/upgrade/rados/b/upgrade_osd_mon_mds.yaml create mode 100644 suites/upgrade/rados/c/tail.yaml delete mode 100644 suites/upgrade/rados/tasks/upgrade_mds_first_rados_api_python.yaml delete mode 100644 suites/upgrade/rados/tasks/upgrade_mds_first_rados_loadgen_big.yaml delete mode 100644 suites/upgrade/rados/tasks/upgrade_mon_first_rados_loadgen_big.yaml delete mode 100644 suites/upgrade/rados/tasks/upgrade_osd_first_rados_api_python.yaml delete mode 100644 suites/upgrade/rados/tasks/upgrade_osd_first_rados_loadgen_big.yaml diff --git a/suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml b/suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml deleted file mode 100644 index 8c48c2eaf162c..0000000000000 --- a/suites/upgrade/basic/tasks/upgrade_mds_mon_osd.yaml +++ /dev/null @@ -1,27 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- ceph-fuse: -- workunit: - clients: - client.0: - - suites/blogbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] -- workunit: - clients: - client.0: - - suites/blogbench.sh diff --git a/suites/upgrade/basic/tasks/upgrade_mds_osd_mon.yaml b/suites/upgrade/basic/tasks/upgrade_mds_osd_mon.yaml deleted file mode 100644 index 2865b17d7bbb9..0000000000000 --- a/suites/upgrade/basic/tasks/upgrade_mds_osd_mon.yaml +++ /dev/null @@ -1,27 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- ceph-fuse: -- workunit: - clients: - client.0: - - suites/fsstress.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c] -- workunit: - clients: - client.0: - - suites/fsstress.sh diff --git a/suites/upgrade/basic/tasks/upgrade_mon_mds_osd.yaml b/suites/upgrade/basic/tasks/upgrade_mon_mds_osd.yaml deleted file mode 100644 index 42c7596ba56b5..0000000000000 --- a/suites/upgrade/basic/tasks/upgrade_mon_mds_osd.yaml +++ /dev/null @@ -1,28 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- ceph-fuse: -- workunit: - clients: - client.0: - - suites/bonnie.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] -- workunit: - clients: - client.0: - - suites/bonnie.sh - diff --git a/suites/upgrade/basic/tasks/upgrade_mon_osd_mds.yaml b/suites/upgrade/basic/tasks/upgrade_mon_osd_mds.yaml deleted file mode 100644 index d349c144b590f..0000000000000 --- a/suites/upgrade/basic/tasks/upgrade_mon_osd_mds.yaml +++ /dev/null @@ -1,27 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- ceph-fuse: -- workunit: - clients: - client.0: - - suites/blogbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a] -- workunit: - clients: - client.0: - - suites/blogbench.sh diff --git a/suites/upgrade/basic/tasks/upgrade_osd_mds_mon.yaml b/suites/upgrade/basic/tasks/upgrade_osd_mds_mon.yaml deleted file mode 100644 index e80d7621b7d29..0000000000000 --- a/suites/upgrade/basic/tasks/upgrade_osd_mds_mon.yaml +++ /dev/null @@ -1,28 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- ceph-fuse: -- workunit: - clients: - client.0: - - suites/blogbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c] -- workunit: - clients: - client.0: - - suites/blogbench.sh - diff --git a/suites/upgrade/basic/tasks/upgrade_osd_mon_mds.yaml b/suites/upgrade/basic/tasks/upgrade_osd_mon_mds.yaml deleted file mode 100644 index 13a3f3ce10b90..0000000000000 --- a/suites/upgrade/basic/tasks/upgrade_osd_mon_mds.yaml +++ /dev/null @@ -1,27 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- ceph-fuse: -- workunit: - clients: - client.0: - - suites/blogbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] -- workunit: - clients: - client.0: - - suites/blogbench.sh diff --git a/suites/upgrade/rados/tasks/upgrade_mon_first_rados_api_python.yaml b/suites/upgrade/rados/a/start.yaml similarity index 57% rename from suites/upgrade/rados/tasks/upgrade_mon_first_rados_api_python.yaml rename to suites/upgrade/rados/a/start.yaml index 27dc585910652..c23b2a95ca318 100644 --- a/suites/upgrade/rados/tasks/upgrade_mon_first_rados_api_python.yaml +++ b/suites/upgrade/rados/a/start.yaml @@ -15,12 +15,7 @@ tasks: - workunit: clients: client.0: - - rados/test_python.sh + - rados/load-gen-mix.sh - install.upgrade: all: branch: next -- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a] -- workunit: - clients: - client.0: - - rados/test.sh diff --git a/suites/upgrade/rados/b/upgrade_mds_mon_osd.yaml b/suites/upgrade/rados/b/upgrade_mds_mon_osd.yaml new file mode 100644 index 0000000000000..d21800684d333 --- /dev/null +++ b/suites/upgrade/rados/b/upgrade_mds_mon_osd.yaml @@ -0,0 +1,2 @@ +tasks: +- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] diff --git a/suites/upgrade/rados/b/upgrade_mds_osd_mon.yaml b/suites/upgrade/rados/b/upgrade_mds_osd_mon.yaml new file mode 100644 index 0000000000000..a8508353e78cd --- /dev/null +++ b/suites/upgrade/rados/b/upgrade_mds_osd_mon.yaml @@ -0,0 +1,2 @@ +tasks: +- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c] diff --git a/suites/upgrade/rados/b/upgrade_mon_mds_osd.yaml b/suites/upgrade/rados/b/upgrade_mon_mds_osd.yaml new file mode 100644 index 0000000000000..78e14e9472a43 --- /dev/null +++ b/suites/upgrade/rados/b/upgrade_mon_mds_osd.yaml @@ -0,0 +1,2 @@ +tasks: +- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] diff --git a/suites/upgrade/rados/b/upgrade_mon_osd_mds.yaml b/suites/upgrade/rados/b/upgrade_mon_osd_mds.yaml new file mode 100644 index 0000000000000..31a79e45938c3 --- /dev/null +++ b/suites/upgrade/rados/b/upgrade_mon_osd_mds.yaml @@ -0,0 +1,2 @@ +tasks: +- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a] diff --git a/suites/upgrade/rados/b/upgrade_osd_mds_mon.yaml b/suites/upgrade/rados/b/upgrade_osd_mds_mon.yaml new file mode 100644 index 0000000000000..dbcd013b3f0e5 --- /dev/null +++ b/suites/upgrade/rados/b/upgrade_osd_mds_mon.yaml @@ -0,0 +1,2 @@ +tasks: +- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c] diff --git a/suites/upgrade/rados/b/upgrade_osd_mon_mds.yaml b/suites/upgrade/rados/b/upgrade_osd_mon_mds.yaml new file mode 100644 index 0000000000000..e8fe288f657db --- /dev/null +++ b/suites/upgrade/rados/b/upgrade_osd_mon_mds.yaml @@ -0,0 +1,2 @@ +tasks: +- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] diff --git a/suites/upgrade/rados/c/tail.yaml b/suites/upgrade/rados/c/tail.yaml new file mode 100644 index 0000000000000..ce99dbd9ed7bd --- /dev/null +++ b/suites/upgrade/rados/c/tail.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + client.0: + - rados/test.sh diff --git a/suites/upgrade/rados/tasks/upgrade_mds_first_rados_api_python.yaml b/suites/upgrade/rados/tasks/upgrade_mds_first_rados_api_python.yaml deleted file mode 100644 index d9d67ddad22a8..0000000000000 --- a/suites/upgrade/rados/tasks/upgrade_mds_first_rados_api_python.yaml +++ /dev/null @@ -1,26 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- workunit: - clients: - client.0: - - rados/test_python.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] -- workunit: - clients: - client.0: - - rados/test_python.sh diff --git a/suites/upgrade/rados/tasks/upgrade_mds_first_rados_loadgen_big.yaml b/suites/upgrade/rados/tasks/upgrade_mds_first_rados_loadgen_big.yaml deleted file mode 100644 index 5ae2c706e9125..0000000000000 --- a/suites/upgrade/rados/tasks/upgrade_mds_first_rados_loadgen_big.yaml +++ /dev/null @@ -1,26 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- workunit: - clients: - client.0: - - rados/load-gen-big.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c] -- workunit: - clients: - client.0: - - rados/load-gen-big.sh diff --git a/suites/upgrade/rados/tasks/upgrade_mon_first_rados_loadgen_big.yaml b/suites/upgrade/rados/tasks/upgrade_mon_first_rados_loadgen_big.yaml deleted file mode 100644 index d56ccd5ce8d80..0000000000000 --- a/suites/upgrade/rados/tasks/upgrade_mon_first_rados_loadgen_big.yaml +++ /dev/null @@ -1,26 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- workunit: - clients: - client.0: - - rados/load-gen-big.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] -- workunit: - clients: - client.0: - - rados/load-gen-big.sh diff --git a/suites/upgrade/rados/tasks/upgrade_osd_first_rados_api_python.yaml b/suites/upgrade/rados/tasks/upgrade_osd_first_rados_api_python.yaml deleted file mode 100644 index 9630392ef311a..0000000000000 --- a/suites/upgrade/rados/tasks/upgrade_osd_first_rados_api_python.yaml +++ /dev/null @@ -1,26 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- workunit: - clients: - client.0: - - rados/test_python.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] -- workunit: - clients: - client.0: - - rados/test_python.sh diff --git a/suites/upgrade/rados/tasks/upgrade_osd_first_rados_loadgen_big.yaml b/suites/upgrade/rados/tasks/upgrade_osd_first_rados_loadgen_big.yaml deleted file mode 100644 index b17b3c6f6c660..0000000000000 --- a/suites/upgrade/rados/tasks/upgrade_osd_first_rados_loadgen_big.yaml +++ /dev/null @@ -1,26 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- workunit: - clients: - client.0: - - rados/load-gen-big.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c] -- workunit: - clients: - client.0: - - rados/load-gen-big.sh -- 2.39.5