upgrade-x: use compatible rados api tests

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

diff --git a/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml b/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml
index f1e30f2419d8ec19dd41517ec57de9ee8c71c3f3..9f18679370cbe4012659988abc38a4dfce6ceaea 100644 (file)
--- a/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml
+++ b/suites/upgrade/firefly-x/parallel/4-final-workload/rados_mon_thrash.yaml
@@ -4,7 +4,8 @@ tasks:
       thrash_delay: 1
   - print: "**** done mon_thrash 4-final-workload"
   - workunit:
+      branch: firefly
       clients:
         client.1:
-          - rados/test.sh
-  - print: "**** done rados/test.sh 4-final-workload"
+          - rados/test-upgrade-v9.0.1.sh
+  - print: "**** done rados/test-upgrade-v9.0.1.sh 4-final-workload"

diff --git a/suites/upgrade/giant-x/parallel/4-final-workload/rados_mon_thrash.yaml b/suites/upgrade/giant-x/parallel/4-final-workload/rados_mon_thrash.yaml
index f1e30f2419d8ec19dd41517ec57de9ee8c71c3f3..fcd6963da410a39d2b0bfaca5b02e71113393d48 100644 (file)
--- a/suites/upgrade/giant-x/parallel/4-final-workload/rados_mon_thrash.yaml
+++ b/suites/upgrade/giant-x/parallel/4-final-workload/rados_mon_thrash.yaml
@@ -4,7 +4,8 @@ tasks:
       thrash_delay: 1
   - print: "**** done mon_thrash 4-final-workload"
   - workunit:
+      branch: giant
       clients:
         client.1:
-          - rados/test.sh
-  - print: "**** done rados/test.sh 4-final-workload"
+          - rados/test-upgrade-v9.0.1.sh
+  - print: "**** done rados/test-upgrade-v9.0.1.sh 4-final-workload"

diff --git a/suites/upgrade/hammer-x/parallel/4-final-workload/rados_mon_thrash.yaml b/suites/upgrade/hammer-x/parallel/4-final-workload/rados_mon_thrash.yaml
index f1e30f2419d8ec19dd41517ec57de9ee8c71c3f3..50860783f88a1919f28282e25f52a3427de75753 100644 (file)
--- a/suites/upgrade/hammer-x/parallel/4-final-workload/rados_mon_thrash.yaml
+++ b/suites/upgrade/hammer-x/parallel/4-final-workload/rados_mon_thrash.yaml
@@ -4,7 +4,8 @@ tasks:
       thrash_delay: 1
   - print: "**** done mon_thrash 4-final-workload"
   - workunit:
+      branch: hammer
       clients:
         client.1:
-          - rados/test.sh
-  - print: "**** done rados/test.sh 4-final-workload"
+          - rados/test-upgrade-v9.0.1.sh
+  - print: "**** done rados/test-upgrade-v9.0.1.sh 4-final-workload"