From: Samuel Just <sjust@redhat.com>
Date: Mon, 10 Oct 2022 23:30:06 +0000 (-0700)
Subject: qa/suites: move seastore to crimson-rados-experimental suite
X-Git-Tag: v18.1.0~336^2~17^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f9c58c041603a6675b34e5ad867ac8a92e7949c4;p=ceph-ci.git

qa/suites: move seastore to crimson-rados-experimental suite

Let's use crimson-rados-experimental for tests that don't yet
pass reliably.  We can move these to crimson-rados as they
become reliable.

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/qa/suites/crimson-rados-experimental/.qa b/qa/suites/crimson-rados-experimental/.qa
new file mode 120000
index 00000000000..fea2489fdf6
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/crimson-rados-experimental/seastore/.qa b/qa/suites/crimson-rados-experimental/seastore/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/% b/qa/suites/crimson-rados-experimental/seastore/basic/%
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/.qa b/qa/suites/crimson-rados-experimental/seastore/basic/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/basic/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/centos_latest.yaml b/qa/suites/crimson-rados-experimental/seastore/basic/centos_latest.yaml
new file mode 120000
index 00000000000..bd9854e7029
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/basic/centos_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/centos_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/clusters/.qa b/qa/suites/crimson-rados-experimental/seastore/basic/clusters/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/basic/clusters/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/clusters/fixed-1.yaml b/qa/suites/crimson-rados-experimental/seastore/basic/clusters/fixed-1.yaml
new file mode 100644
index 00000000000..d8e5898b99f
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/basic/clusters/fixed-1.yaml
@@ -0,0 +1,14 @@
+overrides:
+  ceph-deploy:
+    conf:
+      global:
+        osd pool default size: 2
+        osd crush chooseleaf type: 0
+        osd pool default pg num:  128
+        osd pool default pgp num:  128
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, osd.2, client.0]
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/clusters/fixed-2.yaml b/qa/suites/crimson-rados-experimental/seastore/basic/clusters/fixed-2.yaml
new file mode 100644
index 00000000000..9774de6887b
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/basic/clusters/fixed-2.yaml
@@ -0,0 +1,15 @@
+roles:
+- [mon.a, osd.0, osd.1, client.0, node-exporter.a]
+- [mgr.x, osd.2, osd.3, client.1, prometheus.a, node-exporter.b]
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd shutdown pgref assert: true
+      global:
+        ms cluster mode: crc
+        ms service mode: crc
+        ms client mode: crc
+        ms mon service mode: crc
+        ms mon cluster mode: crc
+        ms mon client mode: crc
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/crimson_qa_overrides.yaml b/qa/suites/crimson-rados-experimental/seastore/basic/crimson_qa_overrides.yaml
new file mode 120000
index 00000000000..2bf67af1b18
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/basic/crimson_qa_overrides.yaml
@@ -0,0 +1 @@
+.qa/config/crimson_qa_overrides.yaml
\ No newline at end of file
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/deploy/.qa b/qa/suites/crimson-rados-experimental/seastore/basic/deploy/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/basic/deploy/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/deploy/ceph.yaml b/qa/suites/crimson-rados-experimental/seastore/basic/deploy/ceph.yaml
new file mode 100644
index 00000000000..c22f08eecf8
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/basic/deploy/ceph.yaml
@@ -0,0 +1,18 @@
+overrides:
+  install:
+    ceph:
+      flavor: crimson
+tasks:
+- install:
+- ceph:
+    conf:
+      osd:
+        debug monc: 20
+      mon:
+        mon min osdmap epochs: 50
+        paxos service trim min: 10
+        # prune full osdmaps regularly
+        mon osdmap full prune min: 15
+        mon osdmap full prune interval: 2
+        mon osdmap full prune txsize: 2
+    flavor: crimson
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/objectstore/.qa b/qa/suites/crimson-rados-experimental/seastore/basic/objectstore/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/basic/objectstore/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/objectstore/seastore.yaml b/qa/suites/crimson-rados-experimental/seastore/basic/objectstore/seastore.yaml
new file mode 100644
index 00000000000..713d9322584
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/basic/objectstore/seastore.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    fs: xfs
+    conf:
+      osd:
+        osd objectstore: seastore
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/tasks/.qa b/qa/suites/crimson-rados-experimental/seastore/basic/tasks/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/basic/tasks/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/tasks/rados_api_tests.yaml b/qa/suites/crimson-rados-experimental/seastore/basic/tasks/rados_api_tests.yaml
new file mode 100644
index 00000000000..ad8c921425b
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/basic/tasks/rados_api_tests.yaml
@@ -0,0 +1,28 @@
+overrides:
+  ceph:
+    log-ignorelist:
+    - reached quota
+    - but it is still running
+    - overall HEALTH_
+    - \(POOL_FULL\)
+    - \(SMALLER_PGP_NUM\)
+    - \(CACHE_POOL_NO_HIT_SET\)
+    - \(CACHE_POOL_NEAR_FULL\)
+    - \(POOL_APP_NOT_ENABLED\)
+    - \(PG_AVAILABILITY\)
+    - \(PG_DEGRADED\)
+    conf:
+      client:
+        debug ms: 1
+      mon:
+        mon warn on pool no app: false
+      osd:
+        osd class load list: "*"
+        osd class default list: "*"
+        osd blocked scrub grace period: 3600
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rados/test.sh
+        - rados/test_pool_quota.sh
diff --git a/qa/suites/crimson-rados-experimental/seastore/basic/tasks/readwrite.yaml b/qa/suites/crimson-rados-experimental/seastore/basic/tasks/readwrite.yaml
new file mode 100644
index 00000000000..f135107c767
--- /dev/null
+++ b/qa/suites/crimson-rados-experimental/seastore/basic/tasks/readwrite.yaml
@@ -0,0 +1,17 @@
+overrides:
+  ceph:
+    crush_tunables: optimal
+    conf:
+      mon:
+        mon osd initial require min compat client: luminous
+      osd:
+        osd_discard_disconnected_ops: false
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    op_weights:
+      read: 45
+      write: 45
+      delete: 10
diff --git a/qa/suites/crimson-rados/seastore/.qa b/qa/suites/crimson-rados/seastore/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/crimson-rados/seastore/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/crimson-rados/seastore/basic/% b/qa/suites/crimson-rados/seastore/basic/%
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/crimson-rados/seastore/basic/.qa b/qa/suites/crimson-rados/seastore/basic/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/crimson-rados/seastore/basic/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/crimson-rados/seastore/basic/centos_latest.yaml b/qa/suites/crimson-rados/seastore/basic/centos_latest.yaml
deleted file mode 120000
index bd9854e7029..00000000000
--- a/qa/suites/crimson-rados/seastore/basic/centos_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/centos_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/crimson-rados/seastore/basic/clusters/.qa b/qa/suites/crimson-rados/seastore/basic/clusters/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/crimson-rados/seastore/basic/clusters/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/crimson-rados/seastore/basic/clusters/fixed-1.yaml b/qa/suites/crimson-rados/seastore/basic/clusters/fixed-1.yaml
deleted file mode 100644
index d8e5898b99f..00000000000
--- a/qa/suites/crimson-rados/seastore/basic/clusters/fixed-1.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  ceph-deploy:
-    conf:
-      global:
-        osd pool default size: 2
-        osd crush chooseleaf type: 0
-        osd pool default pg num:  128
-        osd pool default pgp num:  128
-  ceph:
-    conf:
-      osd:
-        osd shutdown pgref assert: true
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, osd.2, client.0]
diff --git a/qa/suites/crimson-rados/seastore/basic/clusters/fixed-2.yaml b/qa/suites/crimson-rados/seastore/basic/clusters/fixed-2.yaml
deleted file mode 100644
index 9774de6887b..00000000000
--- a/qa/suites/crimson-rados/seastore/basic/clusters/fixed-2.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-roles:
-- [mon.a, osd.0, osd.1, client.0, node-exporter.a]
-- [mgr.x, osd.2, osd.3, client.1, prometheus.a, node-exporter.b]
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd shutdown pgref assert: true
-      global:
-        ms cluster mode: crc
-        ms service mode: crc
-        ms client mode: crc
-        ms mon service mode: crc
-        ms mon cluster mode: crc
-        ms mon client mode: crc
diff --git a/qa/suites/crimson-rados/seastore/basic/crimson_qa_overrides.yaml b/qa/suites/crimson-rados/seastore/basic/crimson_qa_overrides.yaml
deleted file mode 120000
index 2bf67af1b18..00000000000
--- a/qa/suites/crimson-rados/seastore/basic/crimson_qa_overrides.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/config/crimson_qa_overrides.yaml
\ No newline at end of file
diff --git a/qa/suites/crimson-rados/seastore/basic/deploy/.qa b/qa/suites/crimson-rados/seastore/basic/deploy/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/crimson-rados/seastore/basic/deploy/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/crimson-rados/seastore/basic/deploy/ceph.yaml b/qa/suites/crimson-rados/seastore/basic/deploy/ceph.yaml
deleted file mode 100644
index c22f08eecf8..00000000000
--- a/qa/suites/crimson-rados/seastore/basic/deploy/ceph.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-overrides:
-  install:
-    ceph:
-      flavor: crimson
-tasks:
-- install:
-- ceph:
-    conf:
-      osd:
-        debug monc: 20
-      mon:
-        mon min osdmap epochs: 50
-        paxos service trim min: 10
-        # prune full osdmaps regularly
-        mon osdmap full prune min: 15
-        mon osdmap full prune interval: 2
-        mon osdmap full prune txsize: 2
-    flavor: crimson
diff --git a/qa/suites/crimson-rados/seastore/basic/objectstore/.qa b/qa/suites/crimson-rados/seastore/basic/objectstore/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/crimson-rados/seastore/basic/objectstore/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/crimson-rados/seastore/basic/objectstore/seastore.yaml b/qa/suites/crimson-rados/seastore/basic/objectstore/seastore.yaml
deleted file mode 100644
index 713d9322584..00000000000
--- a/qa/suites/crimson-rados/seastore/basic/objectstore/seastore.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-overrides:
-  ceph:
-    fs: xfs
-    conf:
-      osd:
-        osd objectstore: seastore
diff --git a/qa/suites/crimson-rados/seastore/basic/tasks/.qa b/qa/suites/crimson-rados/seastore/basic/tasks/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/crimson-rados/seastore/basic/tasks/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/crimson-rados/seastore/basic/tasks/rados_api_tests.yaml b/qa/suites/crimson-rados/seastore/basic/tasks/rados_api_tests.yaml
deleted file mode 100644
index ad8c921425b..00000000000
--- a/qa/suites/crimson-rados/seastore/basic/tasks/rados_api_tests.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-    - reached quota
-    - but it is still running
-    - overall HEALTH_
-    - \(POOL_FULL\)
-    - \(SMALLER_PGP_NUM\)
-    - \(CACHE_POOL_NO_HIT_SET\)
-    - \(CACHE_POOL_NEAR_FULL\)
-    - \(POOL_APP_NOT_ENABLED\)
-    - \(PG_AVAILABILITY\)
-    - \(PG_DEGRADED\)
-    conf:
-      client:
-        debug ms: 1
-      mon:
-        mon warn on pool no app: false
-      osd:
-        osd class load list: "*"
-        osd class default list: "*"
-        osd blocked scrub grace period: 3600
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rados/test.sh
-        - rados/test_pool_quota.sh
diff --git a/qa/suites/crimson-rados/seastore/basic/tasks/readwrite.yaml b/qa/suites/crimson-rados/seastore/basic/tasks/readwrite.yaml
deleted file mode 100644
index f135107c767..00000000000
--- a/qa/suites/crimson-rados/seastore/basic/tasks/readwrite.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-overrides:
-  ceph:
-    crush_tunables: optimal
-    conf:
-      mon:
-        mon osd initial require min compat client: luminous
-      osd:
-        osd_discard_disconnected_ops: false
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    op_weights:
-      read: 45
-      write: 45
-      delete: 10