removed upgrading clients in parallel to workloads

and also do not run rgw workloads on mixed osds.

Signed-off-by: tamil <tamil.muthamizhan@inktank.com>

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 (file)
index bfbfdcf..0000000
--- 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 (file)
index e69de29..0000000

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 (file)
index e56a598..0000000
--- 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
-