upgrade/hammer-x/point-to-point: fix x client

- install hammer for hammer->x upgrade
- use hammer branch for workunit

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/suites/upgrade/hammer-x/point-to-point-x/point-to-point.yaml b/suites/upgrade/hammer-x/point-to-point-x/point-to-point.yaml
index e15b3c6c91e10d22d74c3e7415bc4aaa79096bb2..04a3c53e805e416c052336f21a5598da41d0adb1 100644 (file)
--- a/suites/upgrade/hammer-x/point-to-point-x/point-to-point.yaml
+++ b/suites/upgrade/hammer-x/point-to-point-x/point-to-point.yaml
@@ -41,6 +41,9 @@ tasks:
    - workload_hammer
    - upgrade-sequence_hammer
 - print: "**** done parallel hammer branch"
+- install.upgrade:
+   client.1:
+     branch: hammer
 - parallel:
    - workload_x
    - upgrade-sequence_x
@@ -183,6 +186,7 @@ upgrade-sequence_hammer:
 workload_x:
    sequential:
    - workunit:
+       branch: hammer
        clients:
          client.1:
          - rados/test-upgrade-v9.0.1.sh