From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 7 Mar 2022 16:33:39 +0000 (-0800)
Subject: qa/tests: added upgrade-clients/client-upgrade-octopus-quincy tests
X-Git-Tag: v15.2.17~104^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2f8031e76eca55eec4053e9eca6220ad672e7767;p=ceph.git

qa/tests: added upgrade-clients/client-upgrade-octopus-quincy tests

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

diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml
index 8354b1772bdd..d8910de2c36b 100644
--- a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml
@@ -1,8 +1,8 @@
 meta:
 - desc: |
-   Insatll and run ceph on one node,
+   Install and run ceph on one node,
    with a separate client 1.
-   Upgrade client 1 to octopus
+   Upgrade client 1 to pacific
    Run tests against old cluster
 roles:
 - - mon.a
diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/.qa b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/.qa
new file mode 120000
index 000000000000..a23f7e045836
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/.qa
@@ -0,0 +1 @@
+../../.qa
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/% b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/.qa b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/.qa
new file mode 120000
index 000000000000..a23f7e045836
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/.qa
@@ -0,0 +1 @@
+../../.qa
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/0-cluster/+ b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/0-cluster/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/0-cluster/.qa b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/0-cluster/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/0-cluster/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/0-cluster/openstack.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/0-cluster/openstack.yaml
new file mode 100644
index 000000000000..b0f3b9b4da22
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-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-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/0-cluster/start.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/0-cluster/start.yaml
new file mode 100644
index 000000000000..2f89e0d59e54
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/0-cluster/start.yaml
@@ -0,0 +1,19 @@
+meta:
+- desc: |
+   Install and run ceph on one node,
+   with a separate client 1.
+   Upgrade client 1 to quincy
+   Run tests against old cluster
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - osd.0
+  - osd.1
+  - osd.2
+  - client.0
+  - mgr.x
+- - client.1
+overrides:
+  ceph:
+    fs: xfs
diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/1-install/.qa b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/1-install/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/1-install/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/1-install/octopus-client-x.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/1-install/octopus-client-x.yaml
new file mode 100644
index 000000000000..571799a35202
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/1-install/octopus-client-x.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: octopus
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev','python34-cephfs','python34-rados']
+- print: "**** done install octopus"
+- install.upgrade:
+   exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1', 'python-ceph']
+   client.1:
+- print: "**** done install.upgrade to -x on client.1"
+- ceph:
+- print: "**** done ceph task"
diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/2-workload/.qa b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/2-workload/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/2-workload/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/2-workload/rbd_notification_tests.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/2-workload/rbd_notification_tests.yaml
new file mode 100644
index 000000000000..e8de4ea7f21c
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/2-workload/rbd_notification_tests.yaml
@@ -0,0 +1,34 @@
+tasks:
+- parallel:
+  - workunit:
+      branch: octopus
+      clients:
+        client.0:
+          - rbd/notify_master.sh
+      env:
+        RBD_FEATURES: "61"
+  - workunit:
+      branch: quincy
+      clients:
+        client.1:
+          - rbd/notify_slave.sh
+      env:
+        RBD_FEATURES: "61"
+        RBD_DISABLE_UPDATE_FEATURES: "1"
+- print: "**** done rbd: old librbd -> new librbd"
+- parallel:
+  - workunit:
+      branch: octopus
+      clients:
+        client.0:
+          - rbd/notify_slave.sh
+      env:
+        RBD_FEATURES: "61"
+  - workunit:
+      branch: quincy
+      clients:
+        client.1:
+          - rbd/notify_master.sh
+      env:
+        RBD_FEATURES: "61"
+- print: "**** done rbd: new librbd -> old librbd"
diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/supported/.qa b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/supported/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/supported/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/supported/ubuntu_20.04.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/supported/ubuntu_20.04.yaml
new file mode 120000
index 000000000000..834ac14f736c
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-quincy/octopus-client-x/rbd/supported/ubuntu_20.04.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/ubuntu_20.04.yaml
\ No newline at end of file