suites/hammer/older: do not upgrade client while running RBD import/export

Between the Giant and Hammer releases, the symbols exported from librados/librbd
were cleaned up.  This creates a short window of time between installing
upgraded packages where symbol lookup errors could occur.

Fixes: #12563
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit cb7eb2ad6f6c56ac1801c1f032faaf40d42cc955)

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

diff --git a/suites/upgrade/hammer/older/2-workload/rbd.yaml b/suites/upgrade/hammer/older/2-workload/rbd.yaml
index 5960273bf4b89fdc62ea628bce5b51ec98a58166..d37b294e15d3489d07e814036eddbc8c1db5f1a9 100644 (file)
--- a/suites/upgrade/hammer/older/2-workload/rbd.yaml
+++ b/suites/upgrade/hammer/older/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/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index b697e2c9580c6da15eecc152a6469a044c725a9f..f0c62fda007c1814860f967ae48aa9e1b849a4ab 100644 (file)
--- a/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade/hammer/older/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/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
index 0f773e4690867e9e4e48818b7e3565052f2c2d17..e4df6c8a1110239ba37ed52fb036ce1ce0472a58 100644 (file)
--- a/suites/upgrade/hammer/older/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ b/suites/upgrade/hammer/older/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: