From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 6 Jan 2021 20:50:10 +0000 (-0800)
Subject: qa/tests: changed the dirs structure
X-Git-Tag: v16.1.0~126^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=962df165b243a086674e12d443f0128b6bea2532;p=ceph.git

qa/tests: changed the dirs structure

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

diff --git a/qa/.qa b/qa/.qa
new file mode 120000
index 000000000000..fea2489fdf6d
--- /dev/null
+++ b/qa/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/% b/qa/suites/upgrade/octopus-x/%
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/qa/suites/upgrade/octopus-x/0-start.yaml b/qa/suites/upgrade/octopus-x/0-start.yaml
deleted file mode 100644
index ad3ee43d38e4..000000000000
--- a/qa/suites/upgrade/octopus-x/0-start.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-roles:
-- - mon.a
-  - mon.c
-  - mgr.y
-  - osd.0
-  - osd.1
-  - osd.2
-  - osd.3
-  - client.0
-  - node-exporter.a
-  - alertmanager.a
-- - mon.b
-  - mgr.x
-  - osd.4
-  - osd.5
-  - osd.6
-  - osd.7
-  - client.1
-  - prometheus.a
-  - grafana.a
-  - node-exporter.b
-openstack:
-- volumes: # attached to each instance
-    count: 4
-    size: 10 # GB
-overrides:
-  ceph:
-    create_rbd_pool: true
-    conf:
-      osd:
-        osd shutdown pgref assert: true
diff --git a/qa/suites/upgrade/octopus-x/1-tasks.yaml b/qa/suites/upgrade/octopus-x/1-tasks.yaml
deleted file mode 100644
index c6b7b0894e8e..000000000000
--- a/qa/suites/upgrade/octopus-x/1-tasks.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-tasks:
-- install:
-    branch: octopus
-- print: "**** done install task..."
-- print: "**** done start installing octopus cephadm ..."
-- cephadm:
-    image: docker.io/ceph/daemon-base:latest-octopus
-    cephadm_branch: octopus
-    conf:
-      osd:
-        #set config option for which cls modules are allowed to be loaded / used
-        osd_class_load_list: "*"
-        osd_class_default_list: "*"
-- print: "**** done end installing octopus cephadm ..."
-
-- print: "**** done start cephadm.shell ceph config set mgr..."
-- cephadm.shell:
-    mon.a:
-      - ceph config set mgr mgr/cephadm/use_repo_digest true --force
-- print: "**** done cephadm.shell ceph config set mgr..."
-
-- print: "**** done start parallel"
-- parallel:
-    - workload
-    - upgrade-sequence
-- print: "**** done end parallel"
diff --git a/qa/suites/upgrade/octopus-x/distro$ b/qa/suites/upgrade/octopus-x/distro$
deleted file mode 120000
index b9db0a58015c..000000000000
--- a/qa/suites/upgrade/octopus-x/distro$
+++ /dev/null
@@ -1 +0,0 @@
-../../rados/cephadm/smoke/distro/
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/mon_election b/qa/suites/upgrade/octopus-x/mon_election
deleted file mode 120000
index 3f331e6214c4..000000000000
--- a/qa/suites/upgrade/octopus-x/mon_election
+++ /dev/null
@@ -1 +0,0 @@
-.qa/mon_election
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/parallel/% b/qa/suites/upgrade/octopus-x/parallel/%
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/upgrade/octopus-x/parallel/.qa b/qa/suites/upgrade/octopus-x/parallel/.qa
new file mode 120000
index 000000000000..fea2489fdf6d
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/parallel/0-start.yaml b/qa/suites/upgrade/octopus-x/parallel/0-start.yaml
new file mode 100644
index 000000000000..ad3ee43d38e4
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel/0-start.yaml
@@ -0,0 +1,31 @@
+roles:
+- - mon.a
+  - mon.c
+  - mgr.y
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+  - client.0
+  - node-exporter.a
+  - alertmanager.a
+- - mon.b
+  - mgr.x
+  - osd.4
+  - osd.5
+  - osd.6
+  - osd.7
+  - client.1
+  - prometheus.a
+  - grafana.a
+  - node-exporter.b
+openstack:
+- volumes: # attached to each instance
+    count: 4
+    size: 10 # GB
+overrides:
+  ceph:
+    create_rbd_pool: true
+    conf:
+      osd:
+        osd shutdown pgref assert: true
diff --git a/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml b/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml
new file mode 100644
index 000000000000..c6b7b0894e8e
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml
@@ -0,0 +1,26 @@
+tasks:
+- install:
+    branch: octopus
+- print: "**** done install task..."
+- print: "**** done start installing octopus cephadm ..."
+- cephadm:
+    image: docker.io/ceph/daemon-base:latest-octopus
+    cephadm_branch: octopus
+    conf:
+      osd:
+        #set config option for which cls modules are allowed to be loaded / used
+        osd_class_load_list: "*"
+        osd_class_default_list: "*"
+- print: "**** done end installing octopus cephadm ..."
+
+- print: "**** done start cephadm.shell ceph config set mgr..."
+- cephadm.shell:
+    mon.a:
+      - ceph config set mgr mgr/cephadm/use_repo_digest true --force
+- print: "**** done cephadm.shell ceph config set mgr..."
+
+- print: "**** done start parallel"
+- parallel:
+    - workload
+    - upgrade-sequence
+- print: "**** done end parallel"
diff --git a/qa/suites/upgrade/octopus-x/parallel/distro1$ b/qa/suites/upgrade/octopus-x/parallel/distro1$
new file mode 120000
index 000000000000..fb247fda1b33
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel/distro1$
@@ -0,0 +1 @@
+../../../rados/cephadm/smoke/distro/
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/parallel/mon_election b/qa/suites/upgrade/octopus-x/parallel/mon_election
new file mode 120000
index 000000000000..3f331e6214c4
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel/mon_election
@@ -0,0 +1 @@
+.qa/mon_election
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/parallel/upgrade-sequence.yaml b/qa/suites/upgrade/octopus-x/parallel/upgrade-sequence.yaml
new file mode 100644
index 000000000000..cb8cba7079b2
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel/upgrade-sequence.yaml
@@ -0,0 +1,15 @@
+# renamed tasks: to upgrade-sequence:
+upgrade-sequence:
+   sequential:
+   - print: "**** done start upgrade, wait"
+   - cephadm.shell:
+       env: [sha1]
+       mon.a:
+         - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1
+         - while ceph orch upgrade status | jq '.in_progress' | grep true ; do ceph orch ps ; ceph versions ; sleep 30 ; done
+         - ceph orch ps
+         - ceph versions
+         - ceph versions | jq -e '.overall | length == 1'
+         - ceph versions | jq -e '.overall | keys' | grep $sha1
+   - print: "**** done end upgrade, wait..."
+
diff --git a/qa/suites/upgrade/octopus-x/parallel/workload/+ b/qa/suites/upgrade/octopus-x/parallel/workload/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/upgrade/octopus-x/parallel/workload/.qa b/qa/suites/upgrade/octopus-x/parallel/workload/.qa
new file mode 120000
index 000000000000..fea2489fdf6d
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel/workload/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/parallel/workload/ec-rados-default.yaml b/qa/suites/upgrade/octopus-x/parallel/workload/ec-rados-default.yaml
new file mode 100644
index 000000000000..67a0f39c5da5
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel/workload/ec-rados-default.yaml
@@ -0,0 +1,25 @@
+meta:
+- desc: |
+   run run randomized correctness test for rados operations
+   on an erasure-coded pool
+workload:
+  full_sequential:
+  - print: "**** done start ec-rados-default.yaml"
+  - rados:
+      clients: [client.0]
+      ops: 4000
+      objects: 50
+      ec_pool: true
+      write_append_excl: false
+      op_weights:
+        read: 100
+        write: 0
+        append: 100
+        delete: 50
+        snap_create: 50
+        snap_remove: 50
+        rollback: 50
+        copy_from: 50
+        setattr: 25
+        rmattr: 25
+  - print: "**** done end ec-rados-default.yaml"
diff --git a/qa/suites/upgrade/octopus-x/parallel/workload/rados_api.yaml b/qa/suites/upgrade/octopus-x/parallel/workload/rados_api.yaml
new file mode 100644
index 000000000000..f18e7d98db69
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel/workload/rados_api.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: |
+   object class functional tests
+workload:
+  full_sequential:
+    - print: "**** done start rados_api.yaml"
+    - workunit:
+        branch: octopus
+        clients:
+          client.0:
+            - cls
+    - print: "**** done end rados_api.yaml"
diff --git a/qa/suites/upgrade/octopus-x/parallel/workload/rados_loadgenbig.yaml b/qa/suites/upgrade/octopus-x/parallel/workload/rados_loadgenbig.yaml
new file mode 100644
index 000000000000..6b93c83d70f6
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel/workload/rados_loadgenbig.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: |
+   generate read/write load with rados objects ranging from 1MB to 25MB
+workload:
+  full_sequential:
+    - print: "**** done start rados_loadgenbig.yaml"
+    - workunit:
+        branch: octopus
+        clients:
+          client.0:
+            - rados/load-gen-big.sh
+    - print: "**** done end rados_loadgenbig.yaml"
diff --git a/qa/suites/upgrade/octopus-x/parallel/workload/test_rbd_api.yaml b/qa/suites/upgrade/octopus-x/parallel/workload/test_rbd_api.yaml
new file mode 100644
index 000000000000..c85d4783c9ca
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel/workload/test_rbd_api.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: |
+   librbd C and C++ api tests
+workload:
+  full_sequential:
+    - print: "**** done start test_rbd_api.yaml"
+    - workunit:
+        branch: octopus
+        clients:
+          client.0:
+              - rbd/test_librbd.sh
+    - print: "**** done end test_rbd_api.yaml"
diff --git a/qa/suites/upgrade/octopus-x/parallel/workload/test_rbd_python.disable b/qa/suites/upgrade/octopus-x/parallel/workload/test_rbd_python.disable
new file mode 100644
index 000000000000..ac0b4cfcf47b
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel/workload/test_rbd_python.disable
@@ -0,0 +1,18 @@
+
+
+##### This is disabled due to https://tracker.ceph.com/issues/48759
+
+
+meta:
+- desc: |
+   librbd python api tests
+workload:
+  full_sequential:
+    - print: "**** done start test_rbd_python.yaml"
+    - workunit:
+        branch: octopus
+        clients:
+          client.0:
+            - rbd/test_librbd_python.sh
+    - print: "**** done end test_rbd_python.yaml"
+
diff --git a/qa/suites/upgrade/octopus-x/upgrade-sequence.yaml b/qa/suites/upgrade/octopus-x/upgrade-sequence.yaml
deleted file mode 100644
index cb8cba7079b2..000000000000
--- a/qa/suites/upgrade/octopus-x/upgrade-sequence.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# renamed tasks: to upgrade-sequence:
-upgrade-sequence:
-   sequential:
-   - print: "**** done start upgrade, wait"
-   - cephadm.shell:
-       env: [sha1]
-       mon.a:
-         - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1
-         - while ceph orch upgrade status | jq '.in_progress' | grep true ; do ceph orch ps ; ceph versions ; sleep 30 ; done
-         - ceph orch ps
-         - ceph versions
-         - ceph versions | jq -e '.overall | length == 1'
-         - ceph versions | jq -e '.overall | keys' | grep $sha1
-   - print: "**** done end upgrade, wait..."
-
diff --git a/qa/suites/upgrade/octopus-x/workload/+ b/qa/suites/upgrade/octopus-x/workload/+
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/qa/suites/upgrade/octopus-x/workload/ec-rados-default.yaml b/qa/suites/upgrade/octopus-x/workload/ec-rados-default.yaml
deleted file mode 100644
index 67a0f39c5da5..000000000000
--- a/qa/suites/upgrade/octopus-x/workload/ec-rados-default.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-meta:
-- desc: |
-   run run randomized correctness test for rados operations
-   on an erasure-coded pool
-workload:
-  full_sequential:
-  - print: "**** done start ec-rados-default.yaml"
-  - rados:
-      clients: [client.0]
-      ops: 4000
-      objects: 50
-      ec_pool: true
-      write_append_excl: false
-      op_weights:
-        read: 100
-        write: 0
-        append: 100
-        delete: 50
-        snap_create: 50
-        snap_remove: 50
-        rollback: 50
-        copy_from: 50
-        setattr: 25
-        rmattr: 25
-  - print: "**** done end ec-rados-default.yaml"
diff --git a/qa/suites/upgrade/octopus-x/workload/rados_api.yaml b/qa/suites/upgrade/octopus-x/workload/rados_api.yaml
deleted file mode 100644
index f18e7d98db69..000000000000
--- a/qa/suites/upgrade/octopus-x/workload/rados_api.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: |
-   object class functional tests
-workload:
-  full_sequential:
-    - print: "**** done start rados_api.yaml"
-    - workunit:
-        branch: octopus
-        clients:
-          client.0:
-            - cls
-    - print: "**** done end rados_api.yaml"
diff --git a/qa/suites/upgrade/octopus-x/workload/rados_loadgenbig.yaml b/qa/suites/upgrade/octopus-x/workload/rados_loadgenbig.yaml
deleted file mode 100644
index 6b93c83d70f6..000000000000
--- a/qa/suites/upgrade/octopus-x/workload/rados_loadgenbig.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: |
-   generate read/write load with rados objects ranging from 1MB to 25MB
-workload:
-  full_sequential:
-    - print: "**** done start rados_loadgenbig.yaml"
-    - workunit:
-        branch: octopus
-        clients:
-          client.0:
-            - rados/load-gen-big.sh
-    - print: "**** done end rados_loadgenbig.yaml"
diff --git a/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml b/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml
deleted file mode 100644
index c85d4783c9ca..000000000000
--- a/qa/suites/upgrade/octopus-x/workload/test_rbd_api.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: |
-   librbd C and C++ api tests
-workload:
-  full_sequential:
-    - print: "**** done start test_rbd_api.yaml"
-    - workunit:
-        branch: octopus
-        clients:
-          client.0:
-              - rbd/test_librbd.sh
-    - print: "**** done end test_rbd_api.yaml"
diff --git a/qa/suites/upgrade/octopus-x/workload/test_rbd_python.disable b/qa/suites/upgrade/octopus-x/workload/test_rbd_python.disable
deleted file mode 100644
index ac0b4cfcf47b..000000000000
--- a/qa/suites/upgrade/octopus-x/workload/test_rbd_python.disable
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-##### This is disabled due to https://tracker.ceph.com/issues/48759
-
-
-meta:
-- desc: |
-   librbd python api tests
-workload:
-  full_sequential:
-    - print: "**** done start test_rbd_python.yaml"
-    - workunit:
-        branch: octopus
-        clients:
-          client.0:
-            - rbd/test_librbd_python.sh
-    - print: "**** done end test_rbd_python.yaml"
-