From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 1 Apr 2019 23:35:59 +0000 (-0700)
Subject: qa: test featureful client with mimic base
X-Git-Tag: v15.1.0~3033^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=40c6319a551cc4b9ffd0c4fbb9e3e7f30a5967bc;p=ceph.git

qa: test featureful client with mimic base

Fixes: http://tracker.ceph.com/issues/39020
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-luminous.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-luminous.yaml
deleted file mode 100644
index 7835cbf93b3b..000000000000
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-luminous.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-meta:
-- desc: |
-   install ceph/luminous latest
-tasks:
-- install:
-    branch: luminous
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-diskprediction-cloud
-      - ceph-mgr-rook
-      - ceph-mgr-ssh
-    extra_packages: ['librados2']
-- print: "**** done installing luminous"
-- 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 luminous
-      - ceph osd set-require-min-compat-client luminous
-- print: "**** done ceph"
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
new file mode 100644
index 000000000000..f9323cc1fb6d
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml
@@ -0,0 +1,41 @@
+meta:
+- desc: |
+   install ceph/mimic latest
+tasks:
+- install:
+    branch: mimic
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
+      - ceph-mgr-ssh
+    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/featureful_client/old_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml
index 88d686fab12e..3baa9c21846f 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 luminous client"
+- print: "**** done mimic 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
index 367206766d8b..c5737ae1f457 100644
--- 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
@@ -6,5 +6,5 @@ tasks:
 - exec:
     mon.a:
       - ceph fs dump --format=json-pretty
-      - ceph fs set cephfs min_compat_client mimic
+      - ceph fs set cephfs min_compat_client nautilus
 - fs.clients_evicted:
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-luminous.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-luminous.yaml
deleted file mode 100644
index 7835cbf93b3b..000000000000
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-luminous.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-meta:
-- desc: |
-   install ceph/luminous latest
-tasks:
-- install:
-    branch: luminous
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-diskprediction-cloud
-      - ceph-mgr-rook
-      - ceph-mgr-ssh
-    extra_packages: ['librados2']
-- print: "**** done installing luminous"
-- 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 luminous
-      - ceph osd set-require-min-compat-client luminous
-- print: "**** done ceph"
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
new file mode 100644
index 000000000000..f9323cc1fb6d
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml
@@ -0,0 +1,41 @@
+meta:
+- desc: |
+   install ceph/mimic latest
+tasks:
+- install:
+    branch: mimic
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
+      - ceph-mgr-ssh
+    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/featureful_client/upgraded_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml
index dc1c0d8d1efc..3196e358842b 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 luminous client"
+- print: "**** done mimic client"
 #- workunit:
 #    clients:
 #      all:
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/4-compat_client.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/4-compat_client.yaml
index bdf484da6499..78809e4fed47 100644
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/4-compat_client.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/4-compat_client.yaml
@@ -6,7 +6,7 @@ tasks:
 - exec:
     mon.a:
       - ceph fs dump --format=json-pretty
-      - ceph fs set cephfs min_compat_client mimic
+      - ceph fs set cephfs min_compat_client nautilus
 - fs.clients_evicted:
     clients:
       client.0: False