qa: add tentacle for cephx upgrade tests

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

diff --git a/qa/suites/rados/upgrade/cephx/release-X/tasks/00-from/v18.2.7.yaml b/qa/suites/rados/upgrade/cephx/release-X/tasks/00-from/v18.2.7.yaml
deleted file mode 100644 (file)
index 7b508e5..0000000
--- a/qa/suites/rados/upgrade/cephx/release-X/tasks/00-from/v18.2.7.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-meta:
-- desc: |
-   install ceph/reef v18.2.7
-tasks:
-- install:
-    tag: v18.2.7
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-rook
-      - ceph-mgr-cephadm
-      - ceph-osd-classic
-      - cephadm
-      - ceph-volume
-    extra_packages: ['librados2']
-- print: "**** done installing v18.2.7"
-- ceph:
-    log-ignorelist:
-      - AUTH_INSECURE_KEYS_ALLOWED
-      - AUTH_INSECURE_KEYS_CREATABLE
-      - AUTH_INSECURE_SERVICE_TICKETS
-      - AUTH_INSECURE_CLIENT_KEY_TYPE
-      - AUTH_INSECURE_SERVICE_KEY_TYPE
-      - AUTH_INSECURE_ROTATING_SERVICE_KEY_TYPE
-    conf:
-      mon:
-        mon_health_to_clog: false
-      global:
-        mon warn on pool no app: false
-- exec:
-    osd.0:
-      - ceph osd set-require-min-compat-client reef
-- print: "**** done ceph"

diff --git a/qa/suites/rados/upgrade/cephx/release-X/tasks/00-from/v20.2.0.yml b/qa/suites/rados/upgrade/cephx/release-X/tasks/00-from/v20.2.0.yml
new file mode 100644 (file)
index 0000000..4f6d6c6
--- /dev/null
+++ b/qa/suites/rados/upgrade/cephx/release-X/tasks/00-from/v20.2.0.yml
@@ -0,0 +1,34 @@
+meta:
+- desc: |
+   install ceph/tentacle v20.2.0
+tasks:
+- install:
+    tag: v20.2.0
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - ceph-osd-classic
+      - cephadm
+      - ceph-volume
+    extra_packages: ['librados2']
+- print: "**** done installing v20.2.0"
+- ceph:
+    log-ignorelist:
+      - AUTH_INSECURE_KEYS_ALLOWED
+      - AUTH_INSECURE_KEYS_CREATABLE
+      - AUTH_INSECURE_SERVICE_TICKETS
+      - AUTH_INSECURE_CLIENT_KEY_TYPE
+      - AUTH_INSECURE_SERVICE_KEY_TYPE
+      - AUTH_INSECURE_ROTATING_SERVICE_KEY_TYPE
+    conf:
+      mon:
+        mon_health_to_clog: false
+      global:
+        mon warn on pool no app: false
+- exec:
+    osd.0:
+      - ceph osd set-require-min-compat-client tentacle
+- print: "**** done ceph"