qa: update require-osd-release to tentacle

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index a5ad370a5b495da992f397c16f37a5ce719615b1..64604216af6dafac5f34ff63e3645a430dd4b947 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -110,6 +110,7 @@ QA suite
 - [x] create qa/suites/upgrade/(X-1)-x
 - [x] remove qa/suites/upgrade/(X-3)-x-*
 - [x] update qa/fs/upgrade/ to remove (X-3) and add (X-1); check with fs team to confirm / help
+- [x] update qa/ upgrade suites require-osd-release calls to tentacle
 - [x] create qa/releases/X.yaml
 - [x] create qa/suites/rados/thrash-old-clients/1-install/(X-1).yaml
 

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 f2c781db9770eaa0af57181f4d1c07b0ba4b5996..911b72849d6ec78865e2215993831477b17366ae 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
@@ -41,7 +41,7 @@ tasks:
     mon.a:
     - ceph osd dump -f json-pretty
     - ceph versions
-    - ceph osd require-osd-release squid
+    - ceph osd require-osd-release tentacle
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
 - ceph.healthy:
 - print: "**** done ceph.restart"

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 0168ddf5ae7e640eff3909b807b06f5bedf68e98..764953661943a0a6c5cd297edfd9bbb30f154f66 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
@@ -41,7 +41,7 @@ tasks:
     mon.a:
     - ceph versions
     - ceph osd dump -f json-pretty
-    - ceph osd require-osd-release squid
+    - ceph osd require-osd-release tentacle
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
 - ceph.healthy:
 - print: "**** done ceph.restart"

diff --git a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
index 3eb76ec7e5c60b2d15bded8009d6f8b33eeb5204..676176dba7ddb7e49d61cd95120c3dfa6c2b5545 100644 (file)
--- a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
+++ b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
@@ -38,7 +38,7 @@ tasks:
     - ceph versions
     - ceph osd dump -f json-pretty
     - ceph fs dump
-    - ceph osd require-osd-release squid
+    - ceph osd require-osd-release tentacle
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
 - ceph.healthy:
 - print: "**** done ceph.restart"

diff --git a/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
index 472dd76b7e95c92bf9e1a2520451ebe5188db510..75a66955cf459f93fe02f9f89f1d9111acfbafd6 100644 (file)
--- a/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
+++ b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
@@ -68,7 +68,7 @@ tasks:
     - cephadm.shell:
         env: [sha1]
         mon.a:
-            - ceph osd require-osd-release squid
+            - ceph osd require-osd-release tentacle
 
     - print: "**** done start telemetry x..."
     - workunit:

diff --git a/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml
index fbaf787d07b7decdfe10835f52cc5ba98a7c86fe..0e596548c40793d19de17f5eb83731f935f34050 100644 (file)
--- a/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml
+++ b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml
@@ -68,7 +68,7 @@ tasks:
     - cephadm.shell:
         env: [sha1]
         mon.a:
-            - ceph osd require-osd-release squid
+            - ceph osd require-osd-release tentacle
 
     - print: "**** done start telemetry x..."
     - workunit: