From: Kefu Chai <kchai@redhat.com>
Date: Thu, 1 Nov 2018 02:57:46 +0000 (+0800)
Subject: qa: add librados3 to exclude list of pre-nautilus install tasks
X-Git-Tag: v14.1.0~1018^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4a5f7624398a641da72eda75f05beb8497e43a3;p=ceph.git

qa: add librados3 to exclude list of pre-nautilus install tasks

Signed-off-by: Kefu Chai <kchai@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 bf627dc394c9..6df131c3efb3 100644
--- 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,6 +4,7 @@ meta:
 tasks:
 - install:
     branch: luminous
+    exclude_packages: ['librados3']
 - print: "**** done installing luminous"
 - ceph:
     log-whitelist:
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 bf627dc394c9..6df131c3efb3 100644
--- 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,6 +4,7 @@ meta:
 tasks:
 - install:
     branch: luminous
+    exclude_packages: ['librados3']
 - print: "**** done installing luminous"
 - ceph:
     log-whitelist:
diff --git a/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml b/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
index bf627dc394c9..6df131c3efb3 100644
--- a/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
+++ b/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
@@ -4,6 +4,7 @@ meta:
 tasks:
 - install:
     branch: luminous
+    exclude_packages: ['librados3']
 - print: "**** done installing luminous"
 - ceph:
     log-whitelist:
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 b2c6b62d8120..2aee309cf475 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
@@ -9,7 +9,7 @@ overrides:
 tasks:
 - install:
     branch: hammer
-    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev', 'librados3', 'libradospp-devel']
 - install.upgrade:
     mon.a:
     mon.b:
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 b68ee3d30bc9..e04a61fd57e1 100644
--- 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,7 @@
 tasks:
 - install:
     branch: jewel
-    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev', 'librados3']
 - install.upgrade:
     mon.a:
     mon.b:
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 1961c8914ec4..d8a590f85417 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
@@ -1,6 +1,7 @@
 tasks:
 - install:
     branch: luminous
+    exclude_packages: ['librados3']
 - install.upgrade:
     mon.a:
     mon.b:
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 c84176f41612..9900058541eb 100644
--- 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,6 +8,7 @@ meta:
 tasks:
 - install:
     branch: luminous
+    exclude_packages: ['librados3']
 - print: "**** done install luminous"
 - ceph:
 - print: "**** done 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 3d57f792b97c..069234b80283 100644
--- 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,6 +6,7 @@ meta:
 tasks:
 - install:
     branch: luminous
+    exclude_packages: ['librados3']
 - print: "**** done installing luminous"
 - ceph:
     log-whitelist: