From: Dhairya Parmar <dparmar@redhat.com>
Date: Thu, 4 Apr 2024 12:25:52 +0000 (+0530)
Subject: qa: upgrade sub-suite nofs from n-1 and n-2 releases
X-Git-Tag: v19.1.0~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=32fc9f8a1152feed35b24ec4386a8768dca6eaae;p=ceph.git

qa: upgrade sub-suite nofs from n-1 and n-2 releases

also adjust the respective upgrade YAMLs and move to
centos9.

For squid branch, start upgrade from quincy/reef.

Fixes: https://tracker.ceph.com/issues/65580
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit f00a69f714dd07d580731a326aff41cacca6d0b6)
(cherry picked from commit 5542bc2c6dfef393a12b16708af5fc6097a38748)
---

diff --git a/qa/suites/fs/upgrade/nofs/centos_8.stream.yaml b/qa/suites/fs/upgrade/nofs/centos_8.stream.yaml
deleted file mode 120000
index e787191b5a270..0000000000000
--- a/qa/suites/fs/upgrade/nofs/centos_8.stream.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/centos_8.stream.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/nofs/centos_9.stream.yaml b/qa/suites/fs/upgrade/nofs/centos_9.stream.yaml
new file mode 120000
index 0000000000000..dca92ddbf45e5
--- /dev/null
+++ b/qa/suites/fs/upgrade/nofs/centos_9.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_9.stream.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-from/quincy.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-from/quincy.yaml
new file mode 100644
index 0000000000000..7d36116499ecc
--- /dev/null
+++ b/qa/suites/fs/upgrade/nofs/tasks/0-from/quincy.yaml
@@ -0,0 +1,39 @@
+meta:
+- desc: |
+   install ceph/quincy latest
+tasks:
+- install:
+    branch: quincy
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - cephadm
+      - ceph-volume
+    extra_packages: ['librados2']
+- print: "**** done installing quincy"
+- 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
+        ms bind msgr2: false
+- exec:
+    osd.0:
+      - ceph osd set-require-min-compat-client quincy
+- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-from/reef.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-from/reef.yaml
new file mode 100644
index 0000000000000..09ac14de15a39
--- /dev/null
+++ b/qa/suites/fs/upgrade/nofs/tasks/0-from/reef.yaml
@@ -0,0 +1,39 @@
+meta:
+- desc: |
+   install ceph/reef latest
+tasks:
+- install:
+    branch: reef
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - cephadm
+      - ceph-volume
+    extra_packages: ['librados2']
+- print: "**** done installing reef"
+- 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
+        ms bind msgr2: false
+- exec:
+    osd.0:
+      - ceph osd set-require-min-compat-client reef
+- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml
deleted file mode 100644
index b74accc69f09d..0000000000000
--- a/qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-meta:
-- desc: |
-   install ceph/pacific latest
-tasks:
-- install:
-    branch: pacific
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-rook
-      - ceph-mgr-cephadm
-      - cephadm
-      - ceph-volume
-    extra_packages: ['librados2']
-- print: "**** done installing pacific"
-- 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
-        ms bind msgr2: false
-- exec:
-    osd.0:
-      - ceph osd set-require-min-compat-client pacific
-- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
index e31e4b43ca8dd..3eb76ec7e5c60 100644
--- a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
+++ b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
@@ -23,7 +23,6 @@ tasks:
     - ceph fs dump
 - install.upgrade:
     mon.a:
-      branch: reef
 - print: "**** done install.upgrade"
 - ceph.restart:
     daemons: [mon.*, mgr.*]
@@ -39,7 +38,7 @@ tasks:
     - ceph versions
     - ceph osd dump -f json-pretty
     - ceph fs dump
-    - ceph osd require-osd-release quincy
+    - ceph osd require-osd-release squid
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
 - ceph.healthy:
 - print: "**** done ceph.restart"