From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 11 Aug 2016 23:35:47 +0000 (-0700)
Subject: jewel-x: use jewel-compatible librados tests for upgraded clients
X-Git-Tag: v11.1.1~58^2^2~127^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c5f7ee3f69355762181d9997dfb6f6a9178334a1;p=ceph.git

jewel-x: use jewel-compatible librados tests for upgraded clients

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/suites/upgrade/jewel-x/parallel/5-final-workload/rados_mon_thrash.yaml b/suites/upgrade/jewel-x/parallel/5-final-workload/rados_mon_thrash.yaml
index f2249c95f6a6..9b60d2ebc3f7 100644
--- a/suites/upgrade/jewel-x/parallel/5-final-workload/rados_mon_thrash.yaml
+++ b/suites/upgrade/jewel-x/parallel/5-final-workload/rados_mon_thrash.yaml
@@ -11,7 +11,8 @@ tasks:
       thrash_delay: 1
   - print: "**** done mon_thrash 4-final-workload"
   - workunit:
+      branch: jewel
       clients:
         client.1:
-          - rados/test.sh
-  - print: "**** done rados/test.sh 4-final-workload"
+          - rados/test-upgrade-v11.0.0.sh
+  - print: "**** done rados/test-upgrade-v11.0.0.sh 4-final-workload"
diff --git a/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml b/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
index ea0b2032b6ac..4912f2cd59d1 100644
--- a/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
+++ b/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
@@ -77,13 +77,14 @@ tasks:
    - workload_x
    - upgrade-sequence_x
 - print: "**** done parallel -x branch"
-# Run test.sh on the -x upgraded cluster
+# Run librados tests on the -x upgraded cluster
 - install.upgrade:
     client.1:
 - workunit:
+    branch: jewel
     clients:
       client.1:
-      - rados/test.sh
+      - rados/test-upgrade-v11.0.0.sh
       - cls
 - print: "**** done final test on -x cluster"
 #######################
@@ -150,15 +151,16 @@ workload_x:
        branch: jewel
        clients:
          client.1:
-         - rados/test.sh
+         - rados/test-upgrade-v11.0.0.sh
          - cls
-   - print: "**** done rados/test.sh &  cls workload_x NOT upgraded  client"
+   - print: "**** done rados/test-upgrade-v11.0.0.sh &  cls workload_x NOT upgraded  client"
    - workunit:
+       branch: jewel
        clients:
          client.0:
-         - rados/test.sh
+         - rados/test-upgrade-v11.0.0.sh
          - cls
-   - print: "**** done rados/test.sh &  cls workload_x upgraded client"
+   - print: "**** done rados/test-upgrade-v11.0.0.sh &  cls workload_x upgraded client"
    - rgw: [client.1]
    - print: "**** done rgw workload_x"
    - s3tests: