From 116ddebf667ae895f1b15e259c19517cbd9c7b9d Mon Sep 17 00:00:00 2001 From: tamil Date: Fri, 17 Oct 2014 05:09:05 -0700 Subject: [PATCH] removed upgrading clients in parallel to workloads and also do not run rgw workloads on mixed osds. Signed-off-by: tamil --- .../upgrade-client-first.yaml | 38 ------------------- .../stress-split/09-workload/+ | 0 .../stress-split/09-workload/rgw-s3tests.yaml | 8 ---- 3 files changed, 46 deletions(-) delete mode 100644 suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-client-first.yaml delete mode 100644 suites/upgrade/dumpling-firefly-x/stress-split/09-workload/+ delete mode 100644 suites/upgrade/dumpling-firefly-x/stress-split/09-workload/rgw-s3tests.yaml diff --git a/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-client-first.yaml b/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-client-first.yaml deleted file mode 100644 index bfbfdcf9d773f..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-client-first.yaml +++ /dev/null @@ -1,38 +0,0 @@ -upgrade-sequence0: - sequential: - - install.upgrade: - client.0: - branch: firefly - - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg" - - install.upgrade: - mon.a: - branch: firefly - - ceph.restart: - daemons: [mon.a] - wait-for-healthy: true - - sleep: - duration: 60 - - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg" - - install.upgrade: - mon.b: - branch: firefly - - ceph.restart: - daemons: [mon.b, mon.c] - wait-for-healthy: true - - sleep: - duration: 60 - - print: "**** done install.upgrade mon.b and mon.c to the version from teuthology-suite arg" - - ceph.restart: [mds.a] - - sleep: - duration: 60 - - ceph.restart: - daemons: [osd.0, osd.1] - wait-for-healthy: true - - sleep: - duration: 60 - - print: "**** done install.upgrade osd.0 and osd.1 to the version from teuthology-suite arg" - - ceph.restart: - daemons: [osd.2, osd.3] - wait-for-healthy: true - - sleep: - duration: 60 diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/09-workload/+ b/suites/upgrade/dumpling-firefly-x/stress-split/09-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/upgrade/dumpling-firefly-x/stress-split/09-workload/rgw-s3tests.yaml b/suites/upgrade/dumpling-firefly-x/stress-split/09-workload/rgw-s3tests.yaml deleted file mode 100644 index e56a5981094df..0000000000000 --- a/suites/upgrade/dumpling-firefly-x/stress-split/09-workload/rgw-s3tests.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- rgw: - default_idle_timeout: 300 - client.0: -- s3tests: - client.0: - rgw_server: client.0 - -- 2.39.5