From: Neha Ojha <nojha@redhat.com>
Date: Wed, 23 May 2018 22:27:41 +0000 (-0700)
Subject: qa/suites/rados/objectstore: move yaml files under a subdir
X-Git-Tag: v14.0.0~23^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F22195%2Fhead;p=ceph.git

qa/suites/rados/objectstore: move yaml files under a subdir

Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/qa/suites/rados/objectstore/alloc-hint.yaml b/qa/suites/rados/objectstore/alloc-hint.yaml
deleted file mode 100644
index d40143c17a78..000000000000
--- a/qa/suites/rados/objectstore/alloc-hint.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, osd.2, client.0]
-openstack:
-  - volumes: # attached to each instance
-      count: 3
-      size: 10 # GB
-
-overrides:
-  ceph:
-    fs: xfs
-    conf:
-      osd:
-        filestore xfs extsize: true
-
-tasks:
-- install:
-- ceph:
-- workunit:
-    clients:
-      all:
-        - rados/test_alloc_hint.sh
diff --git a/qa/suites/rados/objectstore/backends/alloc-hint.yaml b/qa/suites/rados/objectstore/backends/alloc-hint.yaml
new file mode 100644
index 000000000000..d40143c17a78
--- /dev/null
+++ b/qa/suites/rados/objectstore/backends/alloc-hint.yaml
@@ -0,0 +1,21 @@
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, osd.2, client.0]
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
+
+overrides:
+  ceph:
+    fs: xfs
+    conf:
+      osd:
+        filestore xfs extsize: true
+
+tasks:
+- install:
+- ceph:
+- workunit:
+    clients:
+      all:
+        - rados/test_alloc_hint.sh
diff --git a/qa/suites/rados/objectstore/backends/ceph_objectstore_tool.yaml b/qa/suites/rados/objectstore/backends/ceph_objectstore_tool.yaml
new file mode 100644
index 000000000000..f3163c96b555
--- /dev/null
+++ b/qa/suites/rados/objectstore/backends/ceph_objectstore_tool.yaml
@@ -0,0 +1,23 @@
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 6
+    size: 10 # GB
+tasks:
+- install:
+- ceph:
+    fs: xfs
+    conf:
+      global:
+        osd max object name len: 460
+        osd max object namespace len: 64
+    log-whitelist:
+      - overall HEALTH_
+      - \(OSDMAP_FLAGS\)
+      - \(OSD_
+      - \(PG_
+      - \(TOO_FEW_PGS\)
+      - \(POOL_APP_NOT_ENABLED\)
+- ceph_objectstore_tool:
+    objects: 20
diff --git a/qa/suites/rados/objectstore/backends/filejournal.yaml b/qa/suites/rados/objectstore/backends/filejournal.yaml
new file mode 100644
index 000000000000..b0af80084f8c
--- /dev/null
+++ b/qa/suites/rados/objectstore/backends/filejournal.yaml
@@ -0,0 +1,13 @@
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
+tasks:
+- install:
+- ceph:
+    fs: xfs
+- exec:
+    client.0:
+      - ceph_test_filejournal
diff --git a/qa/suites/rados/objectstore/backends/filestore-idempotent-aio-journal.yaml b/qa/suites/rados/objectstore/backends/filestore-idempotent-aio-journal.yaml
new file mode 100644
index 000000000000..58b5197d61b4
--- /dev/null
+++ b/qa/suites/rados/objectstore/backends/filestore-idempotent-aio-journal.yaml
@@ -0,0 +1,14 @@
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
+tasks:
+- install:
+- ceph:
+    fs: xfs
+    conf:
+      global:
+        journal aio: true
+- filestore_idempotent:
diff --git a/qa/suites/rados/objectstore/backends/filestore-idempotent.yaml b/qa/suites/rados/objectstore/backends/filestore-idempotent.yaml
new file mode 100644
index 000000000000..2d3f3c69212d
--- /dev/null
+++ b/qa/suites/rados/objectstore/backends/filestore-idempotent.yaml
@@ -0,0 +1,11 @@
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
+tasks:
+- install:
+- ceph:
+    fs: xfs
+- filestore_idempotent:
diff --git a/qa/suites/rados/objectstore/backends/fusestore.yaml b/qa/suites/rados/objectstore/backends/fusestore.yaml
new file mode 100644
index 000000000000..1c34fcaea2df
--- /dev/null
+++ b/qa/suites/rados/objectstore/backends/fusestore.yaml
@@ -0,0 +1,9 @@
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
+tasks:
+- install:
+- workunit:
+    clients:
+      all:
+        - objectstore/test_fuse.sh
+
diff --git a/qa/suites/rados/objectstore/backends/keyvaluedb.yaml b/qa/suites/rados/objectstore/backends/keyvaluedb.yaml
new file mode 100644
index 000000000000..efff8d379306
--- /dev/null
+++ b/qa/suites/rados/objectstore/backends/keyvaluedb.yaml
@@ -0,0 +1,8 @@
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
+tasks:
+- install:
+- exec:
+    client.0:
+      - mkdir $TESTDIR/kvtest && cd $TESTDIR/kvtest && ceph_test_keyvaluedb
+      - rm -rf $TESTDIR/kvtest
diff --git a/qa/suites/rados/objectstore/backends/objectcacher-stress.yaml b/qa/suites/rados/objectstore/backends/objectcacher-stress.yaml
new file mode 100644
index 000000000000..e407a391807d
--- /dev/null
+++ b/qa/suites/rados/objectstore/backends/objectcacher-stress.yaml
@@ -0,0 +1,14 @@
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
+tasks:
+- install:
+- ceph:
+    fs: xfs
+- workunit:
+    clients:
+      all:
+        - osdc/stress_objectcacher.sh
diff --git a/qa/suites/rados/objectstore/backends/objectstore.yaml b/qa/suites/rados/objectstore/backends/objectstore.yaml
new file mode 100644
index 000000000000..3a0c90353b68
--- /dev/null
+++ b/qa/suites/rados/objectstore/backends/objectstore.yaml
@@ -0,0 +1,12 @@
+roles:
+- [mon.a, mgr.x, osd.0, osd.1, client.0]
+openstack:
+- volumes: # attached to each instance
+    count: 2
+    size: 10 # GB
+tasks:
+- install:
+- exec:
+    client.0:
+      - mkdir $TESTDIR/ostest && cd $TESTDIR/ostest && ulimit -c 0 && ulimit -Sn 16384 && CEPH_ARGS="--no-log-to-stderr --log-file $TESTDIR/archive/ceph_test_objectstore.log --debug-filestore 20 --debug-bluestore 20" ceph_test_objectstore --gtest_filter=-*/3
+      - rm -rf $TESTDIR/ostest
diff --git a/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml b/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml
deleted file mode 100644
index f3163c96b555..000000000000
--- a/qa/suites/rados/objectstore/ceph_objectstore_tool.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, client.0]
-openstack:
-- volumes: # attached to each instance
-    count: 6
-    size: 10 # GB
-tasks:
-- install:
-- ceph:
-    fs: xfs
-    conf:
-      global:
-        osd max object name len: 460
-        osd max object namespace len: 64
-    log-whitelist:
-      - overall HEALTH_
-      - \(OSDMAP_FLAGS\)
-      - \(OSD_
-      - \(PG_
-      - \(TOO_FEW_PGS\)
-      - \(POOL_APP_NOT_ENABLED\)
-- ceph_objectstore_tool:
-    objects: 20
diff --git a/qa/suites/rados/objectstore/filejournal.yaml b/qa/suites/rados/objectstore/filejournal.yaml
deleted file mode 100644
index b0af80084f8c..000000000000
--- a/qa/suites/rados/objectstore/filejournal.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, client.0]
-openstack:
-- volumes: # attached to each instance
-    count: 2
-    size: 10 # GB
-tasks:
-- install:
-- ceph:
-    fs: xfs
-- exec:
-    client.0:
-      - ceph_test_filejournal
diff --git a/qa/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml b/qa/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml
deleted file mode 100644
index 58b5197d61b4..000000000000
--- a/qa/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, client.0]
-openstack:
-- volumes: # attached to each instance
-    count: 2
-    size: 10 # GB
-tasks:
-- install:
-- ceph:
-    fs: xfs
-    conf:
-      global:
-        journal aio: true
-- filestore_idempotent:
diff --git a/qa/suites/rados/objectstore/filestore-idempotent.yaml b/qa/suites/rados/objectstore/filestore-idempotent.yaml
deleted file mode 100644
index 2d3f3c69212d..000000000000
--- a/qa/suites/rados/objectstore/filestore-idempotent.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, client.0]
-openstack:
-- volumes: # attached to each instance
-    count: 2
-    size: 10 # GB
-tasks:
-- install:
-- ceph:
-    fs: xfs
-- filestore_idempotent:
diff --git a/qa/suites/rados/objectstore/fusestore.yaml b/qa/suites/rados/objectstore/fusestore.yaml
deleted file mode 100644
index 1c34fcaea2df..000000000000
--- a/qa/suites/rados/objectstore/fusestore.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, client.0]
-tasks:
-- install:
-- workunit:
-    clients:
-      all:
-        - objectstore/test_fuse.sh
-
diff --git a/qa/suites/rados/objectstore/keyvaluedb.yaml b/qa/suites/rados/objectstore/keyvaluedb.yaml
deleted file mode 100644
index efff8d379306..000000000000
--- a/qa/suites/rados/objectstore/keyvaluedb.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, client.0]
-tasks:
-- install:
-- exec:
-    client.0:
-      - mkdir $TESTDIR/kvtest && cd $TESTDIR/kvtest && ceph_test_keyvaluedb
-      - rm -rf $TESTDIR/kvtest
diff --git a/qa/suites/rados/objectstore/objectcacher-stress.yaml b/qa/suites/rados/objectstore/objectcacher-stress.yaml
deleted file mode 100644
index e407a391807d..000000000000
--- a/qa/suites/rados/objectstore/objectcacher-stress.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, client.0]
-openstack:
-- volumes: # attached to each instance
-    count: 2
-    size: 10 # GB
-tasks:
-- install:
-- ceph:
-    fs: xfs
-- workunit:
-    clients:
-      all:
-        - osdc/stress_objectcacher.sh
diff --git a/qa/suites/rados/objectstore/objectstore.yaml b/qa/suites/rados/objectstore/objectstore.yaml
deleted file mode 100644
index 3a0c90353b68..000000000000
--- a/qa/suites/rados/objectstore/objectstore.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-roles:
-- [mon.a, mgr.x, osd.0, osd.1, client.0]
-openstack:
-- volumes: # attached to each instance
-    count: 2
-    size: 10 # GB
-tasks:
-- install:
-- exec:
-    client.0:
-      - mkdir $TESTDIR/ostest && cd $TESTDIR/ostest && ulimit -c 0 && ulimit -Sn 16384 && CEPH_ARGS="--no-log-to-stderr --log-file $TESTDIR/archive/ceph_test_objectstore.log --debug-filestore 20 --debug-bluestore 20" ceph_test_objectstore --gtest_filter=-*/3
-      - rm -rf $TESTDIR/ostest