From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 2 Oct 2017 19:53:58 +0000 (-0700)
Subject: tests - Added suit to test upgraded clients against kraken ceph clusters
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F18086%2Fhead;p=ceph.git

tests - Added suit to test upgraded clients against kraken ceph clusters

We need to run this suite using suite-branch option in
order to use kraken workloads agains ceph cluster luminous+ branches

Added openstack.yaml bits

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---

diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/% b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/%
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/0-cluster/+ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/0-cluster/+
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/0-cluster/openstack.yaml b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/0-cluster/openstack.yaml
new file mode 100644
index 00000000000..b0f3b9b4da2
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/0-cluster/openstack.yaml
@@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 4
+      size: 30 # GB
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/0-cluster/start.yaml b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/0-cluster/start.yaml
new file mode 100644
index 00000000000..a4cd7548d96
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/0-cluster/start.yaml
@@ -0,0 +1,13 @@
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - osd.0
+  - osd.1
+  - osd.2
+- - client.0
+overrides:
+  ceph:
+    log-whitelist:
+    - failed to encode map
+    fs: xfs
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/1-install/kraken-client-x.yaml b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/1-install/kraken-client-x.yaml
new file mode 100644
index 00000000000..6cd29fd8c7b
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/1-install/kraken-client-x.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: kraken 
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
+- print: "**** done install kraken"
+upgrade_workload:
+  sequential:
+  - install.upgrade:
+      exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1']
+      client.0:
+  - print: "**** done install.upgrade to -x on client.0"
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/2-workload/rbd_api_tests.yaml b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/2-workload/rbd_api_tests.yaml
new file mode 100644
index 00000000000..8939f3a805a
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/2-workload/rbd_api_tests.yaml
@@ -0,0 +1,21 @@
+tasks:
+- exec:
+    client.0:
+    - "cp $(which ceph_test_librbd_api) $TESTDIR/ceph_test_librbd_api"
+- sequential:
+  - upgrade_workload
+- ceph: 
+- print: "**** done ceph"
+- exec:
+    client.0:
+    - "cp --force $TESTDIR/ceph_test_librbd_api $(which ceph_test_librbd_api)"
+    - "rm -rf $TESTDIR/ceph_test_librbd_api"
+- print: "**** done reverting to jewel ceph_test_librbd_api"
+- workunit:
+    branch: kraken
+    clients:
+      client.0:
+      - rbd/test_librbd_api.sh
+    env:
+      RBD_FEATURES: "13"
+- print: "**** done rbd/test_librbd_api.sh"
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/2-workload/rbd_cli_import_export.yaml b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/2-workload/rbd_cli_import_export.yaml
new file mode 100644
index 00000000000..8e3a68b1392
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/2-workload/rbd_cli_import_export.yaml
@@ -0,0 +1,13 @@
+tasks:
+- sequential:
+  - upgrade_workload
+- ceph: 
+- print: "**** done ceph"
+- workunit:
+    branch: kraken
+    clients:
+      client.0:
+      - rbd/import_export.sh
+    env:
+      RBD_CREATE_ARGS: --image-feature layering,exclusive-lock,object-map
+- print: "**** done rbd/import_export.sh"
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/supported b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/supported
new file mode 120000
index 00000000000..ea78f6570e5
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/basic/supported
@@ -0,0 +1 @@
+../../../../../distros/supported/
\ No newline at end of file
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/% b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/%
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/0-cluster/+ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/0-cluster/+
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/0-cluster/openstack.yaml b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/0-cluster/openstack.yaml
new file mode 100644
index 00000000000..b0f3b9b4da2
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/0-cluster/openstack.yaml
@@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 4
+      size: 30 # GB
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/0-cluster/start.yaml b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/0-cluster/start.yaml
new file mode 100644
index 00000000000..4db664b29bc
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/0-cluster/start.yaml
@@ -0,0 +1,14 @@
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - osd.0
+  - osd.1
+  - osd.2
+  - client.0
+- - client.1
+overrides:
+  ceph:
+    log-whitelist:
+    - failed to encode map
+    fs: xfs
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/1-install/kraken-client-x.yaml b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/1-install/kraken-client-x.yaml
new file mode 100644
index 00000000000..2ce1a17b792
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/1-install/kraken-client-x.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: kraken
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
+- print: "**** done install jewel"
+- install.upgrade:
+   exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1']
+   client.1:
+- print: "**** done install.upgrade to -x on client.0"
+- ceph:
+- print: "**** done ceph task"
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/2-features/defaults.yaml b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/2-features/defaults.yaml
new file mode 100644
index 00000000000..dff6623ad03
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/2-features/defaults.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default features: 61
+
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/2-features/layering.yaml b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/2-features/layering.yaml
new file mode 100644
index 00000000000..5613d0155ab
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/2-features/layering.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default features: 1
+
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/3-workload/rbd_notification_tests.yaml b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/3-workload/rbd_notification_tests.yaml
new file mode 100644
index 00000000000..a22842a0c7d
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/3-workload/rbd_notification_tests.yaml
@@ -0,0 +1,21 @@
+tasks:
+- workunit:
+    branch: kraken
+    clients:
+      client.0:
+        - rbd/notify_master.sh
+      client.1:
+        - rbd/notify_slave.sh
+    env:
+      RBD_FEATURES: "13"
+- print: "**** done rbd: old librbd -> new librbd"
+- workunit:
+    branch: kraken
+    clients:
+      client.0:
+        - rbd/notify_slave.sh
+      client.1:
+        - rbd/notify_master.sh
+    env:
+      RBD_FEATURES: "13"
+- print: "**** done rbd: new librbd -> old librbd"
diff --git a/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/supported b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/supported
new file mode 120000
index 00000000000..ea78f6570e5
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-kraken/kraken-client-x/rbd/supported
@@ -0,0 +1 @@
+../../../../../distros/supported/
\ No newline at end of file