From: Mykola Golub <mgolub@suse.com>
Date: Thu, 13 Jun 2019 16:29:10 +0000 (+0100)
Subject: qa/suites/rbd: allow to test with require-min-compat-client octopus
X-Git-Tag: v15.1.0~2357^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=11e29512432ae0c7bbf73e5fcfe76d779a7585c2;p=ceph-ci.git

qa/suites/rbd: allow to test with require-min-compat-client octopus

Signed-off-by: Mykola Golub <mgolub@suse.com>
---

diff --git a/qa/suites/rbd/librbd/min-compat-client/.qa b/qa/suites/rbd/librbd/min-compat-client/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/rbd/librbd/min-compat-client/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/rbd/librbd/min-compat-client/default.yaml b/qa/suites/rbd/librbd/min-compat-client/default.yaml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/rbd/librbd/min-compat-client/octopus.yaml b/qa/suites/rbd/librbd/min-compat-client/octopus.yaml
new file mode 100644
index 00000000000..1cd2df48340
--- /dev/null
+++ b/qa/suites/rbd/librbd/min-compat-client/octopus.yaml
@@ -0,0 +1,4 @@
+tasks:
+- exec:
+    client.0:
+      - sudo ceph osd set-require-min-compat-client octopus
diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-stress-workunit-min-compat-client-octopus.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-stress-workunit-min-compat-client-octopus.yaml
new file mode 100644
index 00000000000..a46adb3a0f3
--- /dev/null
+++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-stress-workunit-min-compat-client-octopus.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon
+tasks:
+- workunit:
+    clients:
+      cluster1.client.mirror: [rbd/rbd_mirror_stress.sh]
+    env:
+      # override workunit setting of CEPH_ARGS='--cluster'
+      CEPH_ARGS: ''
+      RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
+      RBD_MIRROR_MIN_COMPAT_CLIENT: 'octopus'
diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-min-compat-client-octopus.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-min-compat-client-octopus.yaml
new file mode 100644
index 00000000000..b356a2930f7
--- /dev/null
+++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-min-compat-client-octopus.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon
+tasks:
+- workunit:
+    clients:
+      cluster1.client.mirror: [rbd/rbd_mirror.sh]
+    env:
+      # override workunit setting of CEPH_ARGS='--cluster'
+      CEPH_ARGS: ''
+      RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
+      RBD_MIRROR_MIN_COMPAT_CLIENT: 'octopus'
diff --git a/qa/workunits/rbd/rbd_mirror_helpers.sh b/qa/workunits/rbd/rbd_mirror_helpers.sh
index 8f560689ef2..7255eb1e4fd 100755
--- a/qa/workunits/rbd/rbd_mirror_helpers.sh
+++ b/qa/workunits/rbd/rbd_mirror_helpers.sh
@@ -308,6 +308,13 @@ setup()
 
     setup_pools "${CLUSTER1}" "${CLUSTER2}"
     setup_pools "${CLUSTER2}" "${CLUSTER1}"
+
+    if [ -n "${RBD_MIRROR_MIN_COMPAT_CLIENT}" ]; then
+        CEPH_ARGS='' ceph --cluster ${CLUSTER1} osd \
+                 set-require-min-compat-client ${RBD_MIRROR_MIN_COMPAT_CLIENT}
+        CEPH_ARGS='' ceph --cluster ${CLUSTER2} osd \
+                 set-require-min-compat-client ${RBD_MIRROR_MIN_COMPAT_CLIENT}
+    fi
 }
 
 cleanup()