From: Sage Weil <sage@redhat.com>
Date: Mon, 6 Apr 2020 21:32:03 +0000 (-0500)
Subject: qa/suites/fs/upgrade: s/mimic/nautilus/
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1561^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=985c203eec0263b1f564e949c05026e5177604b2;p=ceph-ci.git

qa/suites/fs/upgrade: s/mimic/nautilus/

Also rename 3-compat_client/mimic -> pacific to match the min_client
setting (the naming here confuses me...).

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml
deleted file mode 100644
index 41630e5a159..00000000000
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-meta:
-- desc: |
-   install ceph/mimic latest
-tasks:
-- install:
-    branch: mimic
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-rook
-      - ceph-mgr-cephadm
-      - cephadm
-    extra_packages: ['librados2']
-- print: "**** done installing mimic"
-- ceph:
-    mon_bind_addrvec: false
-    mon_bind_msgr2: false
-    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
-        ms bind msgr2: false
-- exec:
-    osd.0:
-      - ceph osd set-require-min-compat-client mimic
-- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml
new file mode 100644
index 00000000000..a11cb1128be
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml
@@ -0,0 +1,40 @@
+meta:
+- desc: |
+   install ceph/nautilus latest
+tasks:
+- install:
+    branch: nautilus
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - cephadm
+    extra_packages: ['librados2']
+- print: "**** done installing nautilus"
+- ceph:
+    mon_bind_addrvec: false
+    mon_bind_msgr2: false
+    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
+        ms bind msgr2: false
+- exec:
+    osd.0:
+      - ceph osd set-require-min-compat-client nautilus
+- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml
index 3baa9c21846..50092616f55 100644
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml
@@ -1,6 +1,6 @@
 tasks:
 - ceph-fuse:
-- print: "**** done mimic client"
+- print: "**** done nautilus client"
 - workunit:
     clients:
       all:
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/mimic.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/mimic.yaml
deleted file mode 100644
index a3a51ffda43..00000000000
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/mimic.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-      - missing required features
-tasks:
-- exec:
-    mon.a:
-      - ceph fs dump --format=json-pretty
-      - ceph fs set cephfs min_compat_client octopus
-- fs.clients_evicted:
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
new file mode 100644
index 00000000000..d8761e9bd29
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/pacific.yaml
@@ -0,0 +1,10 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - missing required features
+tasks:
+- exec:
+    mon.a:
+      - ceph fs dump --format=json-pretty
+      - ceph fs set cephfs min_compat_client pacific
+- fs.clients_evicted:
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml
deleted file mode 100644
index 41630e5a159..00000000000
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-meta:
-- desc: |
-   install ceph/mimic latest
-tasks:
-- install:
-    branch: mimic
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-rook
-      - ceph-mgr-cephadm
-      - cephadm
-    extra_packages: ['librados2']
-- print: "**** done installing mimic"
-- ceph:
-    mon_bind_addrvec: false
-    mon_bind_msgr2: false
-    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
-        ms bind msgr2: false
-- exec:
-    osd.0:
-      - ceph osd set-require-min-compat-client mimic
-- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml
new file mode 100644
index 00000000000..a11cb1128be
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml
@@ -0,0 +1,40 @@
+meta:
+- desc: |
+   install ceph/nautilus latest
+tasks:
+- install:
+    branch: nautilus
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - cephadm
+    extra_packages: ['librados2']
+- print: "**** done installing nautilus"
+- ceph:
+    mon_bind_addrvec: false
+    mon_bind_msgr2: false
+    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
+        ms bind msgr2: false
+- exec:
+    osd.0:
+      - ceph osd set-require-min-compat-client nautilus
+- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml
index 3196e358842..d45fd6aeb5f 100644
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml
@@ -3,7 +3,7 @@ overrides:
   nuke-on-error: false
 tasks:
 - ceph-fuse:
-- print: "**** done mimic client"
+- print: "**** done nautilus client"
 #- workunit:
 #    clients:
 #      all:
diff --git a/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-mimic.yaml b/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-mimic.yaml
deleted file mode 100644
index 1ca8973bbc2..00000000000
--- a/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-mimic.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-meta:
-- desc: |
-   install ceph/mimic latest
-tasks:
-- install:
-    branch: mimic #tag: v13.2.8
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-diskprediction-cloud
-      - ceph-mgr-rook
-      - ceph-mgr-cephadm
-      - cephadm
-    extra_packages: ['librados2']
-- print: "**** done installing mimic"
-- ceph:
-    mon_bind_addrvec: false
-    mon_bind_msgr2: false
-    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
-        ms bind msgr2: false
-- exec:
-    osd.0:
-      - ceph osd require-osd-release mimic
-      - ceph osd set-require-min-compat-client mimic
-- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-nautilus.yaml b/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-nautilus.yaml
new file mode 100644
index 00000000000..81cc5bab41f
--- /dev/null
+++ b/qa/suites/fs/upgrade/volumes/import-legacy/tasks/0-nautilus.yaml
@@ -0,0 +1,42 @@
+meta:
+- desc: |
+   install ceph/nautilus latest
+tasks:
+- install:
+    branch: nautilus #tag: v13.2.8
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - cephadm
+    extra_packages: ['librados2']
+- print: "**** done installing nautilus"
+- ceph:
+    mon_bind_addrvec: false
+    mon_bind_msgr2: false
+    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
+        ms bind msgr2: false
+- exec:
+    osd.0:
+      - ceph osd require-osd-release nautilus
+      - ceph osd set-require-min-compat-client nautilus
+- print: "**** done ceph"