qa/suites: exclude new packages when installing old versions

Signed-off-by: Sage Weil <sage@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
index 9265bf4b48bff0b46e729e8699081496ce7de5e6..629af5a78d0484322a3419a0fd89bfb13dbbce0f 100644 (file)
--- 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
@@ -4,7 +4,11 @@ meta:
 tasks:
 - install:
     branch: luminous
-    exclude_packages: ['librados3']
+    exclude_packages:
+      - librados3
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
     extra_packages: ['librados2']
 - print: "**** done installing luminous"
 - ceph:

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
index 9265bf4b48bff0b46e729e8699081496ce7de5e6..629af5a78d0484322a3419a0fd89bfb13dbbce0f 100644 (file)
--- 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
@@ -4,7 +4,11 @@ meta:
 tasks:
 - install:
     branch: luminous
-    exclude_packages: ['librados3']
+    exclude_packages:
+      - librados3
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
     extra_packages: ['librados2']
 - print: "**** done installing luminous"
 - ceph:

diff --git a/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml b/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
index 9265bf4b48bff0b46e729e8699081496ce7de5e6..629af5a78d0484322a3419a0fd89bfb13dbbce0f 100644 (file)
--- a/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
+++ b/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
@@ -4,7 +4,11 @@ meta:
 tasks:
 - install:
     branch: luminous
-    exclude_packages: ['librados3']
+    exclude_packages:
+      - librados3
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
     extra_packages: ['librados2']
 - print: "**** done installing luminous"
 - ceph:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
index ef6d381c91b9376a4e2c5fcbf3ed059649954dae..60093ca85f04f25f7d2b81e5182e083fa003ad85 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
@@ -10,7 +10,16 @@ tasks:
 - install:
     branch: hammer
     downgrade_packages: ['librbd1', 'librados2']
-    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev', 'librados3', 'libradospp-devel']
+    exclude_packages:
+      - librados3
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
+      - ceph-mgr
+      - libcephfs2
+      - libcephfs-devel
+      - libcephfs-dev
+      - libradospp-devel
     extra_packages: ['librados2']
 - install.upgrade:
     mon.a:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
index 0238b4636fa4d71a90c4af2723c8abf84929c3b8..c38d57af40d589ef1f49fdb87ad48d4cc9921273 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
@@ -1,7 +1,15 @@
 tasks:
 - install:
     branch: jewel
-    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev', 'librados3']
+    exclude_packages:
+      - librados3
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
+      - ceph-mgr
+      - libcephfs2
+      - libcephfs-devel
+      - libcephfs-dev
     extra_packages: ['librados2']
 - install.upgrade:
     mon.a:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
index 6bd72a0fc06ccb99b5e05d3be1e1c8835d529012..5849e990ba6c56d9f3ba16570ac1584420417ffd 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
@@ -1,7 +1,11 @@
 tasks:
 - install:
     branch: luminous
-    exclude_packages: ['librados3']
+    exclude_packages:
+      - librados3
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
     extra_packages: ['librados2']
 - install.upgrade:
     mon.a:

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml
index 9332a0ef0f54d4863c067e3e95444ca9848e2615..878263803db6f5c58c273cd034123bea97350b5b 100644 (file)
--- a/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml
@@ -8,7 +8,11 @@ meta:
 tasks:
 - install:
     branch: luminous
-    exclude_packages: ['librados3']
+    exclude_packages:
+      - librados3
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
     extra_packages: ['librados2']
 - print: "**** done install luminous"
 - ceph:

diff --git a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml b/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml
index 09b6a08e51af3b1fcd373f85ef2b1b117fb3f62d..3672828b74317932766328c73fcd8473a7ea59fe 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml
@@ -6,7 +6,11 @@ meta:
 tasks:
 - install:
     branch: luminous
-    exclude_packages: ['librados3']
+    exclude_packages:
+      - librados3
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
     extra_packages: ['librados2']
 - print: "**** done installing luminous"
 - ceph:

diff --git a/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml b/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml
index 127031c3fa24a5e32c56266001ce13353bac18a9..982862f46757ab53a9420f8500359dd5bf48aa8b 100644 (file)
--- a/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml
+++ b/qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml
@@ -3,7 +3,11 @@ meta:
 tasks:
 - install:
     branch: luminous
-    exclude_packages: ['librados3']
+    exclude_packages:
+      - librados3
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
     extra_packages: ['librados2']
 - print: "**** done install luminous"
 - ceph:

diff --git a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
index f5f1e39559620f5152f7bccb89a14e30c368dbb9..5f420b099b2d8ecda0e89e35974d1492c7338603 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
@@ -6,7 +6,11 @@ meta:
 tasks:
 - install:
     branch: mimic
-    exclude_packages: ['librados3']
+    exclude_packages:
+      - librados3
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
     extra_packages: ['librados2']
 - print: "**** done installing mimic"
 - ceph:

diff --git a/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
index ec9f3bee75ac63b735c54b6eb38c2091f39cd53f..0a50078b237b420cd036bafe67998d6805193e72 100644 (file)
--- a/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
+++ b/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
@@ -3,7 +3,11 @@ meta:
 tasks:
 - install:
     branch: mimic
-    exclude_packages: ['librados3']
+    exclude_packages:
+      - librados3
+      - ceph-mgr-diskprediction-local
+      - ceph-mgr-diskprediction-cloud
+      - ceph-mgr-rook
     extra_packages: ['librados2']
 - print: "**** done install mimic"
 - ceph: