Fixes #14652

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

diff --git a/suites/upgrade/hammer/newer/0-cluster/start.yaml b/suites/upgrade/hammer/newer/0-cluster/start.yaml
index c344edada4cc4b830d19ebd15502fae5a14e9d18..2f00028f52e9dc05b44acc6f3bc598493c4b9f4e 100644 (file)
--- a/suites/upgrade/hammer/newer/0-cluster/start.yaml
+++ b/suites/upgrade/hammer/newer/0-cluster/start.yaml
@@ -20,4 +20,5 @@ roles:
   - osd.4
   - osd.5
   - client.0
-  - client.1
+- - client.1
+  - client.2

diff --git a/suites/upgrade/hammer/newer/2-workload/rbd.yaml b/suites/upgrade/hammer/newer/2-workload/rbd.yaml
index 5960273bf4b89fdc62ea628bce5b51ec98a58166..d37b294e15d3489d07e814036eddbc8c1db5f1a9 100644 (file)
--- a/suites/upgrade/hammer/newer/2-workload/rbd.yaml
+++ b/suites/upgrade/hammer/newer/2-workload/rbd.yaml
@@ -2,7 +2,7 @@ workload:
    sequential:
    - workunit:
        clients:
-         client.0:
+         client.1:
            - rbd/import_export.sh
        env:
          RBD_CREATE_ARGS: --new-format

diff --git a/suites/upgrade/hammer/newer/2-workload/s3tests.yaml b/suites/upgrade/hammer/newer/2-workload/s3tests.yaml
index 20f81d108a2eba40e6db463e718bb385f690a4a0..086346a9ace62f4e7c188a62f50cd84c869830ae 100644 (file)
--- a/suites/upgrade/hammer/newer/2-workload/s3tests.yaml
+++ b/suites/upgrade/hammer/newer/2-workload/s3tests.yaml
@@ -1,9 +1,9 @@
 workload:
   sequential:
-  - rgw: [client.0]
-  - print: "**** done rgw: [client.0] 2-workload"
+  - rgw: [client.1]
+  - print: "**** done rgw: [client.1] 2-workload"
   - s3tests:
-      client.0:
+      client.1:
         force-branch: hammer
-        rgw_server: client.0
+        rgw_server: client.1
   - print: "**** done s3tests 2-workload off hammer branch"

diff --git a/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index b697e2c9580c6da15eecc152a6469a044c725a9f..f0c62fda007c1814860f967ae48aa9e1b849a4ab 100644 (file)
--- a/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -1,7 +1,8 @@
 upgrade-sequence:
    sequential:
    - install.upgrade:
-      all:
+       mon.a:
+       mon.b:
    - print: "**** done install.upgrade hammer"
    - ceph.restart: [mon.a]
    - sleep:

diff --git a/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
index 0f773e4690867e9e4e48818b7e3565052f2c2d17..e4df6c8a1110239ba37ed52fb036ce1ce0472a58 100644 (file)
--- a/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ b/suites/upgrade/hammer/newer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -1,7 +1,8 @@
 upgrade-sequence:
    sequential:
    - install.upgrade:
-      all:
+       mon.a:
+       mon.b:
    - print: "**** done install.upgrade hammer"
    - ceph.restart: [osd.0]
    - sleep:

diff --git a/suites/upgrade/hammer/newer/4-final/testrgw.yaml b/suites/upgrade/hammer/newer/4-final/testrgw.yaml
index 7b2c2c3b3327bc23c3ec96dbd34fbfd5d0cfe88b..85689decb1c0699c3ab42ec9468a67fbc22c1708 100644 (file)
--- a/suites/upgrade/hammer/newer/4-final/testrgw.yaml
+++ b/suites/upgrade/hammer/newer/4-final/testrgw.yaml
@@ -1,8 +1,9 @@
 tasks:
 - sequential:
-  - rgw: [client.1]
-  - print: "**** done rgw: [client.1] 4-workload"
+  - rgw: [client.2]
+  - print: "**** done rgw: [client.2] 4-workload"
   - s3tests:
-      client.1:
-         rgw_server: client.1
+      client.2:
+         force-branch: hammer
+         rgw_server: client.2
   - print: "**** done s3tests 4-workload"