From: Ramana Raja <rraja@redhat.com>
Date: Thu, 7 Apr 2022 03:39:13 +0000 (-0400)
Subject: qa/suites/fs/upgrade: change octopus installations and references
X-Git-Tag: v18.0.0~910^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F45834%2Fhead;p=ceph.git

qa/suites/fs/upgrade: change octopus installations and references

... to pacific.

Fixes: https://tracker.ceph.com/issues/53996
Signed-off-by: Ramana Raja <rraja@redhat.com>
---

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
index a9eadeb8410..31d0ec3c07d 100644
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
@@ -43,6 +43,5 @@ tasks:
     - ceph versions
     - ceph osd require-osd-release quincy
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
-    #- ceph osd set-require-min-compat-client octopus
 - ceph.healthy:
 - print: "**** done ceph.restart"
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/pacific.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/pacific.yaml
deleted file mode 100644
index 138d8f4e290..00000000000
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/pacific.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - missing required features
-tasks:
-- exec:
-    mon.a:
-      - ceph fs dump --format=json-pretty
-      - ceph fs required_client_features cephfs add metric_collect
-- sleep:
-    duration: 5
-- fs.clients_evicted:
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/quincy.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/quincy.yaml
new file mode 100644
index 00000000000..138d8f4e290
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/quincy.yaml
@@ -0,0 +1,12 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - missing required features
+tasks:
+- exec:
+    mon.a:
+      - ceph fs dump --format=json-pretty
+      - ceph fs required_client_features cephfs add metric_collect
+- sleep:
+    duration: 5
+- fs.clients_evicted:
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
index 6370f9f491e..8529be3e6d9 100644
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
@@ -43,6 +43,5 @@ tasks:
     - ceph osd dump -f json-pretty
     - ceph osd require-osd-release quincy
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
-    #- ceph osd set-require-min-compat-client octopus
 - ceph.healthy:
 - print: "**** done ceph.restart"
diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-octopus.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-octopus.yaml
deleted file mode 100644
index e7774423fa5..00000000000
--- a/qa/suites/fs/upgrade/nofs/tasks/0-octopus.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-meta:
-- desc: |
-   install ceph/octopus latest
-tasks:
-- install:
-    branch: octopus
-    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 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
-        ms bind msgr2: false
-- exec:
-    osd.0:
-      - ceph osd set-require-min-compat-client octopus
-- 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
new file mode 100644
index 00000000000..b74accc69f0
--- /dev/null
+++ b/qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml
@@ -0,0 +1,39 @@
+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 5896252898a..85814287138 100644
--- a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
+++ b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
@@ -40,6 +40,5 @@ tasks:
     - ceph fs dump
     - ceph osd require-osd-release quincy
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
-    #- ceph osd set-require-min-compat-client octopus
 - ceph.healthy:
 - print: "**** done ceph.restart"