From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 28 Sep 2017 00:48:38 +0000 (-0700)
Subject: tests - Added suit to test upgraded clients against hammer ceph clusters
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=91e48a1cdf45f84bbdaab7d57c803e2432d90e0f;p=ceph.git

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

Replaces https://github.com/ceph/ceph/pull/17981
We need to run this suite using suite-branch option in
order to use hammer workloads agains ceph cluster luminous+ branches

Added 'libcephfs1' to exclude_packages in upgrade_workload

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

diff --git a/qa/distros/all/centos_7.4.yaml b/qa/distros/all/centos_7.4.yaml
new file mode 100644
index 000000000000..d06bc384b3fb
--- /dev/null
+++ b/qa/distros/all/centos_7.4.yaml
@@ -0,0 +1,2 @@
+os_type: centos
+os_version: "7.4"
diff --git a/qa/distros/all/ubuntu_16.04.yaml b/qa/distros/all/ubuntu_16.04.yaml
new file mode 100644
index 000000000000..a459fddffb28
--- /dev/null
+++ b/qa/distros/all/ubuntu_16.04.yaml
@@ -0,0 +1,2 @@
+os_type: ubuntu
+os_version: "16.04"
diff --git a/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/% b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/0-cluster/start.yaml b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/0-cluster/start.yaml
new file mode 100644
index 000000000000..ea9c37d0dbb7
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/0-cluster/start.yaml
@@ -0,0 +1,14 @@
+roles:
+- - mon.a
+  - osd.0
+  - osd.1
+- - mon.b
+  - mon.c
+  - osd.2
+  - osd.3
+- - client.0
+overrides:
+  ceph:
+    log-whitelist:
+    - failed to encode map
+    fs: xfs
diff --git a/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/1-install/hammer-client-x.yaml b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/1-install/hammer-client-x.yaml
new file mode 100644
index 000000000000..6de333f996a9
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/1-install/hammer-client-x.yaml
@@ -0,0 +1,12 @@
+tasks:
+- install:
+    branch: hammer 
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
+- print: "**** done install hammer"
+upgrade_workload:
+  sequential:
+  - install.upgrade:
+      exclude_packages: ['ceph-test-dbg','libcephfs1']
+      client.0:
+  - print: "**** done install.upgrade client.0"
+
diff --git a/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/2-workload/rbd_api_tests.yaml b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/2-workload/rbd_api_tests.yaml
new file mode 100644
index 000000000000..6638d14e2bc9
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/2-workload/rbd_api_tests.yaml
@@ -0,0 +1,26 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default features: 13
+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 hammer ceph_test_librbd_api"
+- workunit:
+    branch: hammer
+    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-hammer/hammer-client-x/basic/2-workload/rbd_cli_import_export.yaml b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/2-workload/rbd_cli_import_export.yaml
new file mode 100644
index 000000000000..dfaa0e8783d4
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/2-workload/rbd_cli_import_export.yaml
@@ -0,0 +1,13 @@
+tasks:
+- sequential:
+  - upgrade_workload
+- ceph: 
+- print: "**** done ceph"
+- workunit:
+    branch: hammer
+    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-hammer/hammer-client-x/basic/distros/% b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/distros/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/distros/centos_7.4.yaml b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/distros/centos_7.4.yaml
new file mode 120000
index 000000000000..dcc00174237d
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/distros/centos_7.4.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/centos_7.4.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/distros/ubuntu_16.04.yaml b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/distros/ubuntu_16.04.yaml
new file mode 120000
index 000000000000..9dc1ea992848
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/basic/distros/ubuntu_16.04.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/ubuntu_16.04.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/% b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/0-cluster/start.yaml b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/0-cluster/start.yaml
new file mode 100644
index 000000000000..4c9f32493acf
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/0-cluster/start.yaml
@@ -0,0 +1,17 @@
+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
+    conf:
+      client:
+        rbd default features: 1
diff --git a/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/1-install/hammer-client-x.yaml b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/1-install/hammer-client-x.yaml
new file mode 100644
index 000000000000..2b6c44cfca88
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/1-install/hammer-client-x.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: hammer
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
+- print: "**** done install hammer"
+- install.upgrade:
+   exclude_packages: ['ceph-test-dbg','libcephfs1']
+   client.1:
+- print: "**** done install.upgrade client.1"
+- ceph:
+- print: "**** done ceph"
diff --git a/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/2-workload/rbd_notification_tests.yaml b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/2-workload/rbd_notification_tests.yaml
new file mode 100644
index 000000000000..984dfa037cb9
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/2-workload/rbd_notification_tests.yaml
@@ -0,0 +1,21 @@
+tasks:
+- workunit:
+    branch: hammer
+    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: hammer
+    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-hammer/hammer-client-x/rbd/distros/% b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/distros/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/distros/centos_7.4.yaml b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/distros/centos_7.4.yaml
new file mode 120000
index 000000000000..dcc00174237d
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/distros/centos_7.4.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/centos_7.4.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/distros/ubuntu_16.04.yaml b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/distros/ubuntu_16.04.yaml
new file mode 120000
index 000000000000..9dc1ea992848
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-hammer/hammer-client-x/rbd/distros/ubuntu_16.04.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/ubuntu_16.04.yaml
\ No newline at end of file