From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 26 Jan 2021 16:15:08 +0000 (-0800)
Subject: qa/tests: added centos yaml
X-Git-Tag: v16.2.0~233^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b4e6a27b481e551c8624a9f2fce1259738f834c;p=ceph.git

qa/tests: added centos yaml

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

diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/1-ceph-install/nautilus.yaml
deleted file mode 100644
index 7e43410793cf..000000000000
--- a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/1-ceph-install/nautilus.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-meta:
-- desc: |
-   install ceph/octopus latest
-   run workload and upgrade-sequence in parallel
-   upgrade the client node
-tasks:
-- install:
-    exclude_packages:
-      - ceph-mgr-cephadm
-      - cephadm
-      - libcephfs-dev
-    branch: octopus
-- print: "**** done installing octopus"
-- ceph:
-    log-whitelist:
-      - overall HEALTH_
-      - \(FS_
-      - \(MDS_
-      - \(OSD_
-      - \(MON_DOWN\)
-      - \(CACHE_POOL_
-      - \(POOL_
-      - \(MGR_DOWN\)
-      - \(PG_
-      - \(SMALLER_PGP_NUM\)
-      - Monitor daemon marked osd
-      - Behind on trimming
-      - Manager daemon
-    conf:
-      global:
-        mon warn on pool no app: false
-        bluestore_warn_on_legacy_statfs: false
-        bluestore warn on no per pool omap: false
-        mon pg warn min per osd: 0
-- exec:
-    osd.0:
-      - ceph osd set-require-min-compat-client octopus
-- print: "**** done ceph"
-- install.upgrade:
-    mon.a:
-    mon.b:
-    mon.c:
-- print: "**** done install.upgrade non-client hosts"
-- rgw:
-   - client.1
-- print: "**** done => started rgw client.1"
-- parallel:
-    - workload
-    - upgrade-sequence
-- print: "**** done parallel"
-- install.upgrade:
-    client.0:
-- print: "**** done install.upgrade on client.0"
diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/1-ceph-install/octopus.yaml b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/1-ceph-install/octopus.yaml
new file mode 100644
index 000000000000..17303380af87
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/1-ceph-install/octopus.yaml
@@ -0,0 +1,53 @@
+meta:
+- desc: |
+   install ceph/octopus latest
+   run workload and upgrade-sequence in parallel
+   upgrade the client node
+tasks:
+- install:
+    exclude_packages:
+      - ceph-mgr-cephadm
+      - cephadm
+      - libcephfs-dev
+    branch: octopus
+- print: "**** done installing octopus"
+- ceph:
+    log-ignorelist:
+      - overall HEALTH_
+      - \(FS_
+      - \(MDS_
+      - \(OSD_
+      - \(MON_DOWN\)
+      - \(CACHE_POOL_
+      - \(POOL_
+      - \(MGR_DOWN\)
+      - \(PG_
+      - \(SMALLER_PGP_NUM\)
+      - Monitor daemon marked osd
+      - Behind on trimming
+      - Manager daemon
+    conf:
+      global:
+        mon warn on pool no app: false
+        bluestore_warn_on_legacy_statfs: false
+        bluestore warn on no per pool omap: false
+        mon pg warn min per osd: 0
+- exec:
+    osd.0:
+      - ceph osd set-require-min-compat-client octopus
+- print: "**** done ceph"
+- install.upgrade:
+    mon.a:
+    mon.b:
+    mon.c:
+- print: "**** done install.upgrade non-client hosts"
+- rgw:
+   - client.1
+- print: "**** done => started rgw client.1"
+- parallel:
+    - workload
+    - upgrade-sequence
+- print: "**** done parallel"
+- install.upgrade:
+    client.0:
+- print: "**** done install.upgrade on client.0"
diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/2-workload/test_rbd_python.disable b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/2-workload/test_rbd_python.disable
deleted file mode 100644
index 1e33f1b7237a..000000000000
--- a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/2-workload/test_rbd_python.disable
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   librbd python api tests
-workload:
-  full_sequential:
-    - workunit:
-        branch: octopus
-        clients:
-          client.0:
-            - rbd/test_librbd_python.sh
-    - print: "**** done rbd/test_librbd_python.sh 2-workload"
diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/2-workload/test_rbd_python.yaml b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/2-workload/test_rbd_python.yaml
new file mode 100644
index 000000000000..d03abf5d9889
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/2-workload/test_rbd_python.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   librbd python api tests
+workload:
+  full_sequential:
+    - workunit:
+        branch: octopus
+        clients:
+          client.0:
+            - rbd/test_librbd_python.sh
+    - print: "**** done rbd/test_librbd_python.sh 2-workload "
diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-all.yaml
index e8349b690ff1..6486efdb86a8 100644
--- a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-all.yaml
+++ b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/3-upgrade-sequence/upgrade-all.yaml
@@ -16,7 +16,8 @@ upgrade-sequence:
        wait-for-healthy: false
        wait-for-osds-up: true
    - ceph.restart:
-       daemons: [mds.a, rgw.*]
+       #daemons: [mds.a, rgw.*] this needs to be added when mds is enabled in riles
+       daemons: [rgw.*]
        wait-for-healthy: false
        wait-for-osds-up: true
    - print: "**** done ceph.restart all"
diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/centos_latest.yaml b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/centos_latest.yaml
new file mode 120000
index 000000000000..bd9854e70298
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/centos_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/centos_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/ubuntu_latest.disable b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/ubuntu_latest.disable
new file mode 120000
index 000000000000..3a09f9abb05c
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/ubuntu_latest.disable
@@ -0,0 +1 @@
+.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/ubuntu_latest.yaml b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/ubuntu_latest.yaml
deleted file mode 120000
index 3a09f9abb05c..000000000000
--- a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/ubuntu_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file