qa: update fs:upgrade to N-2 release for U

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

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/reef.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/reef.yaml
deleted file mode 100644 (file)
index ddccab4..0000000
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/reef.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-meta:
-- desc: |
-   install ceph/reef latest
-tasks:
-- install:
-    branch: reef
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-rook
-      - ceph-mgr-cephadm
-      - cephadm
-      - ceph-volume
-      - ceph-osd-classic
-      - ceph-osd-crimson
-    extra_packages: ['librados2']
-- print: "**** done installing reef"
-- 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 reef
-- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/tentacle.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/tentacle.yaml
new file mode 100644 (file)
index 0000000..1014565
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/tentacle.yaml
@@ -0,0 +1,41 @@
+meta:
+- desc: |
+   install ceph/tentacle latest
+tasks:
+- install:
+    branch: tentacle
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - cephadm
+      - ceph-volume
+      - ceph-osd-classic
+      - ceph-osd-crimson
+    extra_packages: ['librados2']
+- print: "**** done installing tentacle"
+- 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 tentacle
+- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/reef.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/reef.yaml
deleted file mode 100644 (file)
index ddccab4..0000000
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/reef.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-meta:
-- desc: |
-   install ceph/reef latest
-tasks:
-- install:
-    branch: reef
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-rook
-      - ceph-mgr-cephadm
-      - cephadm
-      - ceph-volume
-      - ceph-osd-classic
-      - ceph-osd-crimson
-    extra_packages: ['librados2']
-- print: "**** done installing reef"
-- 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 reef
-- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/tentacle.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/tentacle.yaml
new file mode 100644 (file)
index 0000000..1014565
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/tentacle.yaml
@@ -0,0 +1,41 @@
+meta:
+- desc: |
+   install ceph/tentacle latest
+tasks:
+- install:
+    branch: tentacle
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - cephadm
+      - ceph-volume
+      - ceph-osd-classic
+      - ceph-osd-crimson
+    extra_packages: ['librados2']
+- print: "**** done installing tentacle"
+- 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 tentacle
+- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/tentacle.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/tentacle.yaml
new file mode 100644 (file)
index 0000000..1014565
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/tentacle.yaml
@@ -0,0 +1,41 @@
+meta:
+- desc: |
+   install ceph/tentacle latest
+tasks:
+- install:
+    branch: tentacle
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - cephadm
+      - ceph-volume
+      - ceph-osd-classic
+      - ceph-osd-crimson
+    extra_packages: ['librados2']
+- print: "**** done installing tentacle"
+- 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 tentacle
+- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-from/reef.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-from/reef.yaml
deleted file mode 100644 (file)
index ddccab4..0000000
--- a/qa/suites/fs/upgrade/nofs/tasks/0-from/reef.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-meta:
-- desc: |
-   install ceph/reef latest
-tasks:
-- install:
-    branch: reef
-    exclude_packages:
-      - librados3
-      - ceph-mgr-dashboard
-      - ceph-mgr-diskprediction-local
-      - ceph-mgr-rook
-      - ceph-mgr-cephadm
-      - cephadm
-      - ceph-volume
-      - ceph-osd-classic
-      - ceph-osd-crimson
-    extra_packages: ['librados2']
-- print: "**** done installing reef"
-- 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 reef
-- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-from/tentacle.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-from/tentacle.yaml
new file mode 100644 (file)
index 0000000..0be92c3
--- /dev/null
+++ b/qa/suites/fs/upgrade/nofs/tasks/0-from/tentacle.yaml
@@ -0,0 +1,39 @@
+meta:
+- desc: |
+   install ceph/tentacle latest
+tasks:
+- install:
+    branch: tentacle
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - cephadm
+      - ceph-volume
+    extra_packages: ['librados2']
+- print: "**** done installing tentacle"
+- 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 tentacle
+- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/reef.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/reef.yaml
deleted file mode 100644 (file)
index 00a2ba1..0000000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/reef.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-meta:
-- desc: |
-   install ceph/reef latest
-tasks:
-- install:
-    branch: reef
-    exclude_packages:
-      - cephadm
-      - ceph-mgr-cephadm
-      - ceph-immutable-object-cache
-      - python3-rados
-      - python3-rgw
-      - python3-rbd
-      - python3-cephfs
-      - ceph-volume
-      - ceph-osd-classic
-      - ceph-osd-crimson
-    extra_packages:
-      - python-rados
-      - python-rgw
-      - python-rbd
-      - python-cephfs
-    # For kernel_untar_build workunit
-    extra_system_packages:
-      - bison
-      - flex
-      - elfutils-libelf-devel
-      - openssl-devel
-      - NetworkManager
-      - iproute
-      - util-linux
-- print: "**** done installing reef"
-- 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 reef
-- print: "**** done ceph"

diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/tentacle.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/tentacle.yaml
new file mode 100644 (file)
index 0000000..8678c72
--- /dev/null
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/tentacle.yaml
@@ -0,0 +1,40 @@
+meta:
+- desc: |
+   install ceph/tentacle latest
+tasks:
+- install:
+    branch: tentacle
+    exclude_packages:
+      - librados3
+      - ceph-mgr-dashboard
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-rook
+      - ceph-mgr-cephadm
+      - ceph-osd-crimson
+      - cephadm
+      - ceph-volume
+    extra_packages: ['librados2']
+- print: "**** done installing tentacle"
+- 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 tentacle
+- print: "**** done ceph"