tests - Added yaml fragmet to cover testing...

... for http://tracker.ceph.com/issues/21660#note-17
for jewel-x (see similar https://github.com/ceph/ceph/pull/18200)

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

diff --git a/qa/releases/luminous-with-mgr.yaml b/qa/releases/luminous-with-mgr.yaml
index ea3130768705eda898274a890089816d7865e5bc..d500803750ece62d628029caa73c13f0ba5768a5 100644 (file)
--- a/qa/releases/luminous-with-mgr.yaml
+++ b/qa/releases/luminous-with-mgr.yaml
@@ -2,7 +2,6 @@ tasks:
 - exec:
     osd.0:
       - ceph osd require-osd-release luminous
-      - ceph osd set-require-min-compat-client luminous
 - ceph.healthy:
 overrides:
   ceph:

diff --git a/qa/suites/upgrade/jewel-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/jewel-x/parallel/0-cluster/start.yaml
index 3145626320cfae5d745ca4ce060740734e47f1f4..d1f1e1070446aa9f80bd5bacf735462e7c66879e 100644 (file)
--- a/qa/suites/upgrade/jewel-x/parallel/0-cluster/start.yaml
+++ b/qa/suites/upgrade/jewel-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/jewel-x/parallel/4-luminous.yaml b/qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml
deleted file mode 120000 (symlink)
index 5283ac73e1b27948229b24e7b91b13dc6b9337a1..0000000000000000000000000000000000000000
--- a/qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../releases/luminous.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml b/qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..e57b37753de0c3da08b75002d691b96954c57551
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml
@@ -0,0 +1,23 @@
+# this is the same fragment as ../../../../releases/luminous.yaml
+# but without line "ceph osd set-require-min-compat-client luminous" 
+
+tasks:
+- exec:
+    mgr.x:
+      - mkdir -p /var/lib/ceph/mgr/ceph-x
+      - ceph auth get-or-create-key mgr.x mon 'allow profile mgr'
+      - ceph auth export mgr.x > /var/lib/ceph/mgr/ceph-x/keyring
+- ceph.restart:
+    daemons: [mgr.x]
+    wait-for-healthy: false
+- exec:
+    osd.0:
+      - ceph osd require-osd-release luminous
+- ceph.healthy:
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon warn on osd down out interval zero: false
+    log-whitelist:
+      - no active mgr

diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/+ b/qa/suites/upgrade/jewel-x/parallel/5-final-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/blogbench.yaml b/qa/suites/upgrade/jewel-x/parallel/5-final-workload/blogbench.yaml
deleted file mode 100644 (file)
index d2629c0..0000000
--- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/blogbench.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-meta:
-- desc: |
-   run a cephfs stress test
-   mount ceph-fuse on client.3 before running workunit
-tasks:
-- sequential:
-  - ceph-fuse:
-  - print: "**** done ceph-fuse 5-final-workload"
-  - workunit:
-      clients:
-         client.3:
-          - suites/blogbench.sh
-  - print: "**** done suites/blogbench.sh 5-final-workload"

diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados-snaps-few-objects.yaml
deleted file mode 100644 (file)
index d8b3dcb..0000000
--- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados-snaps-few-objects.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool with snapshots
-tasks:
-  - rados:
-      clients: [client.1]
-      ops: 4000
-      objects: 50
-      write_append_excl: false
-      op_weights:
-        read: 100
-        write: 100
-        delete: 50
-        snap_create: 50
-        snap_remove: 50
-        rollback: 50
-  - print: "**** done rados 4-final-workload"

diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados_loadgenmix.yaml
deleted file mode 100644 (file)
index 922a9da..0000000
--- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados_loadgenmix.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: |
-   generate read/write load with rados objects ranging from 1 byte to 1MB
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - rados/load-gen-mix.sh
-  - print: "**** done rados/load-gen-mix.sh 4-final-workload"

diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados_mon_thrash.yaml
deleted file mode 100644 (file)
index 9b60d2e..0000000
--- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rados_mon_thrash.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-meta:
-- desc: |
-   librados C and C++ api tests
-overrides:
-  ceph:
-    log-whitelist:
-      - reached quota
-tasks:
-  - mon_thrash:
-      revive_delay: 20
-      thrash_delay: 1
-  - print: "**** done mon_thrash 4-final-workload"
-  - workunit:
-      branch: jewel
-      clients:
-        client.1:
-          - rados/test-upgrade-v11.0.0.sh
-  - print: "**** done rados/test-upgrade-v11.0.0.sh 4-final-workload"

diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rbd_cls.yaml b/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rbd_cls.yaml
deleted file mode 100644 (file)
index aaf0a37..0000000
--- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rbd_cls.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: |
-   rbd object class functional tests
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - cls/test_cls_rbd.sh
-  - print: "**** done cls/test_cls_rbd.sh 4-final-workload"

diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rbd_import_export.yaml
deleted file mode 100644 (file)
index 46e1355..0000000
--- a/qa/suites/upgrade/jewel-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/jewel-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rgw_swift.yaml
deleted file mode 100644 (file)
index 7a7659f..0000000
--- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rgw_swift.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-meta:
-- desc: |
-   swift api tests for rgw
-overrides:
-  rgw:
-    frontend: civetweb
-tasks:
-  - rgw: [client.1]
-  - print: "**** done rgw 4-final-workload"
-  - swift:
-      client.1:
-        rgw_server: client.1
-  - print: "**** done swift 4-final-workload"

diff --git a/qa/suites/upgrade/jewel-x/parallel/5-workload.yaml b/qa/suites/upgrade/jewel-x/parallel/5-workload.yaml
new file mode 100644 (file)
index 0000000..f7e9de4
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/parallel/5-workload.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   run basic import/export cli tests for rbd on not upgrated client.4
+   (covers issue http://tracker.ceph.com/issues/21660)
+tasks:
+  - workunit:
+      branch: jewel
+      clients:
+        client.4:
+          - rbd/import_export.sh
+  - print: "**** done rbd/import_export.sh 5-workload"

diff --git a/qa/suites/upgrade/jewel-x/parallel/6-luminous-with-mgr.yaml b/qa/suites/upgrade/jewel-x/parallel/6-luminous-with-mgr.yaml
new file mode 120000 (symlink)
index 0000000..5c72153
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/parallel/6-luminous-with-mgr.yaml
@@ -0,0 +1 @@
+../../../../releases/luminous-with-mgr.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/jewel-x/parallel/7-final-workload/+ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/upgrade/jewel-x/parallel/7-final-workload/blogbench.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..b36ace1
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/blogbench.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: |
+   run a cephfs stress test
+   mount ceph-fuse on client.3 before running workunit
+tasks:
+- sequential:
+  - ceph-fuse:
+  - print: "**** done ceph-fuse 5-final-workload"
+  - workunit:
+      clients:
+         client.3:
+          - suites/blogbench.sh
+  - print: "**** done suites/blogbench.sh 7-final-workload"

diff --git a/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados-snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..7dd61c5
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados-snaps-few-objects.yaml
@@ -0,0 +1,17 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool with snapshots
+tasks:
+  - rados:
+      clients: [client.1]
+      ops: 4000
+      objects: 50
+      write_append_excl: false
+      op_weights:
+        read: 100
+        write: 100
+        delete: 50
+        snap_create: 50
+        snap_remove: 50
+        rollback: 50
+  - print: "**** done rados 7-final-workload"

diff --git a/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados_loadgenmix.yaml
new file mode 100644 (file)
index 0000000..b218b92
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados_loadgenmix.yaml
@@ -0,0 +1,9 @@
+meta:
+- desc: |
+   generate read/write load with rados objects ranging from 1 byte to 1MB
+tasks:
+  - workunit:
+      clients:
+        client.1:
+          - rados/load-gen-mix.sh
+  - print: "**** done rados/load-gen-mix.sh 7-final-workload"

diff --git a/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados_mon_thrash.yaml
new file mode 100644 (file)
index 0000000..c835a65
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados_mon_thrash.yaml
@@ -0,0 +1,18 @@
+meta:
+- desc: |
+   librados C and C++ api tests
+overrides:
+  ceph:
+    log-whitelist:
+      - reached quota
+tasks:
+  - mon_thrash:
+      revive_delay: 20
+      thrash_delay: 1
+  - print: "**** done mon_thrash 4-final-workload"
+  - workunit:
+      branch: jewel
+      clients:
+        client.1:
+          - rados/test-upgrade-v11.0.0.sh
+  - print: "**** done rados/test-upgrade-v11.0.0.sh 7-final-workload"

diff --git a/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rbd_cls.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rbd_cls.yaml
new file mode 100644 (file)
index 0000000..46bbf76
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rbd_cls.yaml
@@ -0,0 +1,9 @@
+meta:
+- desc: |
+   rbd object class functional tests
+tasks:
+  - workunit:
+      clients:
+        client.1:
+          - cls/test_cls_rbd.sh
+  - print: "**** done cls/test_cls_rbd.sh 7-final-workload"

diff --git a/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rbd_import_export.yaml
new file mode 100644 (file)
index 0000000..5ae7491
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rbd_import_export.yaml
@@ -0,0 +1,11 @@
+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 7-final-workload"

diff --git a/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml
new file mode 100644 (file)
index 0000000..780c4ad
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: |
+   swift api tests for rgw
+overrides:
+  rgw:
+    frontend: civetweb
+tasks:
+  - rgw: [client.1]
+  - print: "**** done rgw 7-final-workload"
+  - swift:
+      client.1:
+        rgw_server: client.1
+  - print: "**** done swift 7-final-workload"