From: Sage Weil <sage@redhat.com>
Date: Mon, 21 Sep 2015 16:30:39 +0000 (-0400)
Subject: upgrade/hammer-x/point-to-point: fix x client
X-Git-Tag: v11.1.1~58^2^2~504^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=58453d3f55f0a188626d2cf8291c01533cad3e9c;p=ceph-ci.git

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 e15b3c6c91e..04a3c53e805 100644
--- 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