From: Josh Durgin <jdurgin@redhat.com>
Date: Fri, 27 Mar 2020 15:39:49 +0000 (-0400)
Subject: qa/tests: use py3 version of rbd scripts
X-Git-Tag: v12.2.14~15^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F34159%2Fhead;p=ceph.git

qa/tests: use py3 version of rbd scripts

client.1 is upgraded to octopus, so grab the same version of the rbd
workunit and test tree that will run py3 there.

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

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/3-workload/rbd_notification_tests.yaml b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/3-workload/rbd_notification_tests.yaml
index 17d2c17db0ce..975dc0233c6f 100644
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/3-workload/rbd_notification_tests.yaml
+++ b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/3-workload/rbd_notification_tests.yaml
@@ -1,21 +1,33 @@
 tasks:
-- workunit:
-    branch: luminous
-    clients:
-      client.0:
-        - rbd/notify_master.sh
-      client.1:
-        - rbd/notify_slave.sh
-    env:
-      RBD_FEATURES: "61"
+- parallel:
+  - workunit:
+      branch: luminous
+      clients:
+        client.0:
+          - rbd/notify_master.sh
+      env:
+        RBD_FEATURES: "61"
+  - workunit:
+      branch: octopus
+      clients:
+        client.1:
+          - rbd/notify_slave.sh
+      env:
+        RBD_FEATURES: "61"
 - print: "**** done rbd: old librbd -> new librbd"
-- workunit:
-    branch: luminous
-    clients:
-      client.0:
-        - rbd/notify_slave.sh
-      client.1:
-        - rbd/notify_master.sh
-    env:
-      RBD_FEATURES: "61"
+- parallel:
+  - workunit:
+      branch: luminous
+      clients:
+        client.0:
+          - rbd/notify_slave.sh
+      env:
+        RBD_FEATURES: "61"
+  - workunit:
+      branch: octopus
+      clients:
+        client.1:
+          - rbd/notify_master.sh
+      env:
+        RBD_FEATURES: "61"
 - print: "**** done rbd: new librbd -> old librbd"