From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 11 Oct 2017 20:12:45 +0000 (-0700)
Subject: tests - Added yaml fragmet to cover testing...
X-Git-Tag: v12.2.2~156^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F18254%2Fhead;p=ceph.git

tests - Added yaml fragmet to cover testing...
... for http://tracker.ceph.com/issues/21660#note-17

for luminous-x (see similar #18200, #18226)

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit e7fdda31803cd37604a9296a876320bfcb849d34)
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---

diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
index 1e8d5a58ddf..3684b1e0a0a 100644
--- a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
@@ -18,6 +18,7 @@ roles:
   - client.1
   - client.2
   - client.3
+- - client.4
 overrides:
   ceph:
     log-whitelist:
diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml
deleted file mode 100644
index 46e13550687..00000000000
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   run basic import/export cli tests for rbd
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - rbd/import_export.sh
-      env:
-        RBD_CREATE_ARGS: --new-format
-  - print: "**** done rbd/import_export.sh 4-final-workload"
diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export_no_upgrated.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export_no_upgrated.yaml
new file mode 100644
index 00000000000..5de8a23615b
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export_no_upgrated.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: |
+   run basic import/export cli tests for rbd
+   on NO upgrated client
+tasks:
+  - workunit:
+      branch: luminous
+      clients:
+        client.4:
+          - rbd/import_export.sh
+      env:
+        RBD_CREATE_ARGS: --new-format
+  - print: "**** done rbd/import_export.sh 4-final-workload on NO upgrated client"
diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export_upgrated.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export_upgrated.yaml
new file mode 100644
index 00000000000..2c7c484e114
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export_upgrated.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: |
+   run basic import/export cli tests for rbd
+   on upgrated client
+tasks:
+  - workunit:
+      clients:
+        client.1:
+          - rbd/import_export.sh
+      env:
+        RBD_CREATE_ARGS: --new-format
+  - print: "**** done rbd/import_export.sh 4-final-workload  on upgrated client"