qa: Add nvmeof upgrade from v20.2.0

Also update install task for nvmeof/upgrade test

Fixes: https://tracker.ceph.com/issues/75453
Signed-off-by: Vallari Agrawal <vallari.agrawal@ibm.com>

diff --git a/qa/suites/nvmeof/upgrade/0-clusters/4-gateways-1-initiator.yaml b/qa/suites/nvmeof/upgrade/0-clusters/4-gateways-1-initiator.yaml
index 76f245fdcddb29a11b11edef9139bbc6f5388d78..c5c80dfed07d36ac986f2981fb9fe3b5609d4d65 100644 (file)
--- a/qa/suites/nvmeof/upgrade/0-clusters/4-gateways-1-initiator.yaml
+++ b/qa/suites/nvmeof/upgrade/0-clusters/4-gateways-1-initiator.yaml
@@ -26,7 +26,3 @@ roles:
   - client.4
   - ceph.nvmeof.nvmeof.d
 
-tasks:
-- install:
-    extra_packages:
-        - nvme-cli

diff --git a/qa/suites/nvmeof/upgrade/1-start-distro/1-start-centos_9.stream-squid.yaml b/qa/suites/nvmeof/upgrade/1-start-distro/1-start-centos_9.stream-squid.yaml
index 8e3b778a1f90d39ea3cc08b0fcdd58fcb9b875e9..58a19615f5c450464c2c5e3ec4dd3204c308b2a6 100644 (file)
--- a/qa/suites/nvmeof/upgrade/1-start-distro/1-start-centos_9.stream-squid.yaml
+++ b/qa/suites/nvmeof/upgrade/1-start-distro/1-start-centos_9.stream-squid.yaml
@@ -2,6 +2,16 @@ os_type: centos
 os_version: "9.stream"
 
 tasks:
+- install:
+    branch: squid-nvmeof
+    exclude_packages:
+      - ceph-volume
+      - ceph-osd-classic
+      - ceph-osd-crimson
+    extra_packages:
+      - nvme-cli
+- print: "**** done install task..."
+
 - cephadm:
     image: quay.ceph.io/ceph-ci/ceph:squid-nvmeof
     compiled_cephadm_branch: squid-nvmeof

diff --git a/qa/suites/nvmeof/upgrade/1-start-distro/1-start-centos_9.stream-tentacle.yaml b/qa/suites/nvmeof/upgrade/1-start-distro/1-start-centos_9.stream-tentacle.yaml
new file mode 100644 (file)
index 0000000..80619c8
--- /dev/null
+++ b/qa/suites/nvmeof/upgrade/1-start-distro/1-start-centos_9.stream-tentacle.yaml
@@ -0,0 +1,29 @@
+os_type: centos
+os_version: "9.stream"
+
+tasks:
+- install:
+    branch: tentacle
+    exclude_packages:
+      - ceph-volume
+      - ceph-osd-classic
+      - ceph-osd-crimson
+    extra_packages:
+      - nvme-cli
+- print: "**** done install task..."
+
+- cephadm:
+    image: quay.ceph.io/ceph-ci/ceph:tentacle
+    compiled_cephadm_branch: tentacle
+
+- nvmeof:
+    installer: host.a
+    rbd:
+      pool_name: mypool
+      image_name_prefix: myimage
+    gateway_config:
+      subsystems_count: 3
+      namespaces_count: 20
+
+- cephadm.wait_for_service:
+    service: nvmeof.mypool.mygroup0

diff --git a/qa/suites/nvmeof/upgrade/1-start-distro/1-start-centos_9.stream-v20.2.0.yaml b/qa/suites/nvmeof/upgrade/1-start-distro/1-start-centos_9.stream-v20.2.0.yaml
new file mode 100644 (file)
index 0000000..121a80a
--- /dev/null
+++ b/qa/suites/nvmeof/upgrade/1-start-distro/1-start-centos_9.stream-v20.2.0.yaml
@@ -0,0 +1,28 @@
+os_type: centos
+os_version: "9.stream"
+
+tasks:
+- install:
+    tag: v20.2.0
+    exclude_packages:
+      - ceph-volume
+      - ceph-osd-classic
+      - ceph-osd-crimson
+    extra_packages:
+      - nvme-cli
+- print: "**** done install task..."
+
+- cephadm:
+    image: quay.io/ceph/ceph:v20.2.0
+
+- nvmeof:
+    installer: host.a
+    rbd:
+      pool_name: mypool
+      image_name_prefix: myimage
+    gateway_config:
+      subsystems_count: 3
+      namespaces_count: 20
+
+- cephadm.wait_for_service:
+    service: nvmeof.mypool.mygroup0