From a7952949a874ca886c8ebacaba9b1d34a69e5bae Mon Sep 17 00:00:00 2001
From: Deepika Upadhyay <dupadhya@redhat.com>
Date: Wed, 13 Oct 2021 11:47:11 +0530
Subject: [PATCH] qa/suites/rbd: remove baremetal based setup needed for iscsi
 testing

* replace ceph baremetal deployment with cephadm based deployment

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
---
 qa/suites/rbd/iscsi/base/install.yaml         | 23 +++++++------------
 qa/suites/rbd/iscsi/cluster/fixed-3.yaml      | 21 ++++++++++++++---
 qa/suites/rbd/iscsi/pool/.qa                  |  1 -
 qa/suites/rbd/iscsi/pool/datapool.yaml        | 12 ----------
 .../{ceph_iscsi.yaml => cephadm_iscsi.yaml}   | 17 +++++++-------
 5 files changed, 34 insertions(+), 40 deletions(-)
 delete mode 120000 qa/suites/rbd/iscsi/pool/.qa
 delete mode 100644 qa/suites/rbd/iscsi/pool/datapool.yaml
 rename qa/suites/rbd/iscsi/workloads/{ceph_iscsi.yaml => cephadm_iscsi.yaml} (67%)

diff --git a/qa/suites/rbd/iscsi/base/install.yaml b/qa/suites/rbd/iscsi/base/install.yaml
index e35affe7e24f4..5c5a6c31f60b4 100644
--- a/qa/suites/rbd/iscsi/base/install.yaml
+++ b/qa/suites/rbd/iscsi/base/install.yaml
@@ -1,21 +1,14 @@
 use_shaman: True
 tasks:
+- cephadm:
+- cephadm.shell:
+    host.a:
+    - ceph orch status
+    - ceph orch ps
+    - ceph orch ls
+    - ceph orch host ls
+    - ceph orch device ls
 - install:
     extra_packages:
       - iscsi-initiator-utils
       - device-mapper-multipath
-- ceph:
-- install:
-    packages:
-      rpm:
-      - tcmu-runner
-    project: tcmu-runner
-    sha1: latest
-- install:
-    packages:
-      rpm:
-      - ceph-iscsi
-    shaman:
-      force_noarch: True
-    project: ceph-iscsi
-    sha1: latest
diff --git a/qa/suites/rbd/iscsi/cluster/fixed-3.yaml b/qa/suites/rbd/iscsi/cluster/fixed-3.yaml
index bf1eb6018b40a..426ea32cf81f8 100644
--- a/qa/suites/rbd/iscsi/cluster/fixed-3.yaml
+++ b/qa/suites/rbd/iscsi/cluster/fixed-3.yaml
@@ -1,4 +1,19 @@
 roles:
-- [mon.a, osd.0, osd.1, osd.2, a_gateway.0]
-- [mon.b, osd.3, osd.4, osd.5, b_client.0]
-- [mon.c, mgr.x, osd.6, osd.7, c_gateway.1]
+- - host.a
+  - mon.a
+  - mgr.x
+  - osd.0
+  - osd.1
+  - client.0
+  - ceph.iscsi.iscsi.a
+- - mon.b
+  - osd.2
+  - osd.3
+  - osd.4
+  - client.1
+- - mon.c
+  - osd.5
+  - osd.6
+  - osd.7
+  - client.2
+  - ceph.iscsi.iscsi.b
diff --git a/qa/suites/rbd/iscsi/pool/.qa b/qa/suites/rbd/iscsi/pool/.qa
deleted file mode 120000
index a602a0353e751..0000000000000
--- a/qa/suites/rbd/iscsi/pool/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/rbd/iscsi/pool/datapool.yaml b/qa/suites/rbd/iscsi/pool/datapool.yaml
deleted file mode 100644
index 45b00378b83c2..0000000000000
--- a/qa/suites/rbd/iscsi/pool/datapool.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - overall HEALTH_
-      - \(CACHE_POOL_NEAR_FULL\)
-      - \(CACHE_POOL_NO_HIT_SET\)
-tasks:
-- exec:
-    a_gateway.0:
-      - sudo ceph osd pool create rbd 4
-      - sudo ceph osd pool create datapool 4
-      - sudo ceph osd pool application enable datapool rbd
diff --git a/qa/suites/rbd/iscsi/workloads/ceph_iscsi.yaml b/qa/suites/rbd/iscsi/workloads/cephadm_iscsi.yaml
similarity index 67%
rename from qa/suites/rbd/iscsi/workloads/ceph_iscsi.yaml
rename to qa/suites/rbd/iscsi/workloads/cephadm_iscsi.yaml
index f91a35eafd22e..202e6d8b5ec84 100644
--- a/qa/suites/rbd/iscsi/workloads/ceph_iscsi.yaml
+++ b/qa/suites/rbd/iscsi/workloads/cephadm_iscsi.yaml
@@ -1,22 +1,21 @@
 tasks:
-- ceph_iscsi:
-    gateways: [a_gateway.0, c_gateway.1]
-    clients: [b_client.0]
+- ceph_iscsi_client:
+    clients: [client.1]
 - cram:
     parallel: False
     clients:
-      a_gateway.0:
+      client.0:
       - src/test/cli-integration/rbd/gwcli_create.t
-      b_client.0:
+      client.1:
       - src/test/cli-integration/rbd/iscsi_client.t
-      c_gateway.1:
+      client.2:
       - src/test/cli-integration/rbd/gwcli_delete.t
 - cram:
     parallel: False
     clients:
-      a_gateway.0:
+      client.0:
       - src/test/cli-integration/rbd/rest_api_create.t
-      b_client.0:
+      client.1:
       - src/test/cli-integration/rbd/iscsi_client.t
-      c_gateway.1:
+      client.2:
       - src/test/cli-integration/rbd/rest_api_delete.t
-- 
2.39.5