From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 17 Nov 2015 21:37:21 +0000 (-0800)
Subject: Added infernalis-client-x - fixes #13774
X-Git-Tag: v10.2.6~165^2^2~265^2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8fcb67e1f9c5fcf1cac5d779447dbcee37410bf;p=ceph.git

Added infernalis-client-x - fixes #13774

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

diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/% b/suites/upgrade/client-upgrade/infernalis-client-x/basic/%
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/0-cluster/start.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/basic/0-cluster/start.yaml
new file mode 100644
index 00000000000..8ab0246e107
--- /dev/null
+++ b/suites/upgrade/client-upgrade/infernalis-client-x/basic/0-cluster/start.yaml
@@ -0,0 +1,12 @@
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - osd.0
+  - osd.1
+  - osd.2
+- - client.0
+overrides:
+  ceph:
+    log-whitelist:
+    - failed to encode map
diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/1-install/infernalis-client-x.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/basic/1-install/infernalis-client-x.yaml
new file mode 100644
index 00000000000..b1ea2c47d12
--- /dev/null
+++ b/suites/upgrade/client-upgrade/infernalis-client-x/basic/1-install/infernalis-client-x.yaml
@@ -0,0 +1,10 @@
+tasks:
+- install:
+    branch: infernalis 
+- print: "**** done install infernalis"
+upgrade_workload:
+  sequential:
+  - install.upgrade:
+      exclude_packages: ['ceph-test', 'ceph-test-dbg']
+      client.0:
+  - print: "**** done install.upgrade to -x on client.0"
diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_api_tests.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_api_tests.yaml
new file mode 100644
index 00000000000..99321c67513
--- /dev/null
+++ b/suites/upgrade/client-upgrade/infernalis-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 hammer ceph_test_librbd_api"
+- workunit:
+    branch: infernalis
+    clients:
+      client.0:
+      - rbd/test_librbd_api.sh
+    env:
+      RBD_FEATURES: "13"
+- print: "**** done rbd/test_librbd_api.sh"
diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml
new file mode 100644
index 00000000000..deb849af2d1
--- /dev/null
+++ b/suites/upgrade/client-upgrade/infernalis-client-x/basic/2-workload/rbd_cli_import_export.yaml
@@ -0,0 +1,13 @@
+tasks:
+- sequential:
+  - upgrade_workload
+- ceph: 
+- print: "**** done ceph"
+- workunit:
+    branch: infernalis
+    clients:
+      client.0:
+      - rbd/import_export.sh
+    env:
+      RBD_CREATE_ARGS: --new-format
+- print: "**** done rbd/import_export.sh"
diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/% b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/%
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml
new file mode 100644
index 00000000000..0cdce9259e0
--- /dev/null
+++ b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/0-cluster/start.yaml
@@ -0,0 +1,13 @@
+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
diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/1-install/infernalis-client-x.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/1-install/infernalis-client-x.yaml
new file mode 100644
index 00000000000..80052e03018
--- /dev/null
+++ b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/1-install/infernalis-client-x.yaml
@@ -0,0 +1,10 @@
+tasks:
+- install:
+   branch: infernalis
+- print: "**** done install infernalis"
+- install.upgrade:
+   exclude_packages: ['ceph-test', 'ceph-test-dbg']
+   client.1:
+- print: "**** done install.upgrade to -x on client.0"
+- ceph:
+- print: "**** done ceph"
diff --git a/suites/upgrade/client-upgrade/infernalis-client-x/rbd/2-workload/rbd_notification_tests.yaml b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/2-workload/rbd_notification_tests.yaml
new file mode 100644
index 00000000000..f83742f823d
--- /dev/null
+++ b/suites/upgrade/client-upgrade/infernalis-client-x/rbd/2-workload/rbd_notification_tests.yaml
@@ -0,0 +1,21 @@
+tasks:
+- workunit:
+    branch: infernalis
+    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: infernalis
+    clients:
+      client.0:
+        - rbd/notify_slave.sh
+      client.1:
+        - rbd/notify_master.sh
+    env:
+      RBD_FEATURES: "13"
+- print: "**** done rbd: new librbd -> old librbd"