qa: Update featureful_client suite to use octopus instead of nautilus

Signed-off-by: Sidharth Anupkrishnan <sanupkri@redhat.com>

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
deleted file mode 100644 (file)
index c89d18b..0000000
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-nautilus.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-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:
-    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 nautilus
-- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-octopus.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-octopus.yaml
new file mode 100644 (file)
index 0000000..40d3475
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-octopus.yaml
@@ -0,0 +1,38 @@
+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
+    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/featureful_client/old_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml
index 50092616f55086fe1a67b06da071a40ef7c8d2b8..976d6e2650bf90a2cfe9d9a247c65fd028673a8d 100644 (file)
--- 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 nautilus client"
+- print: "**** done octopus client"
 - workunit:
     clients:
       all:

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 0d22a26a612fae8ea3d8bb0ba6bbb6b3a6dc21cb..41485dac44a20dcc3ff8ffc3e3585ab8721ddc14 100644 (file)
--- 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,6 @@ tasks:
     - ceph versions
     - ceph osd require-osd-release octopus
     - 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 nautilus
+    #- ceph osd set-require-min-compat-client octopus
 - ceph.healthy:
 - print: "**** done ceph.restart"

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
deleted file mode 100644 (file)
index c89d18b..0000000
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-nautilus.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-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:
-    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 nautilus
-- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-octopus.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-octopus.yaml
new file mode 100644 (file)
index 0000000..40d3475
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-octopus.yaml
@@ -0,0 +1,38 @@
+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
+    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/featureful_client/upgraded_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml
index d45fd6aeb5f36507ee39415872d0add481caf37d..c9b4c046f6c43b4e284c540ebc93b9c3ddba6c98 100644 (file)
--- 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 nautilus client"
+- print: "**** done octopus client"
 #- workunit:
 #    clients:
 #      all:

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 687cac4e57b4d8aae49942d7215dcf0f4d5fb1fe..0df6f13c73995328338962e46d7af112b3bc5e7c 100644 (file)
--- 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,6 @@ tasks:
     - ceph osd dump -f json-pretty
     - ceph osd require-osd-release octopus
     - 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 nautilus
+    #- ceph osd set-require-min-compat-client octopus
 - ceph.healthy:
 - print: "**** done ceph.restart"