From b4a5f7624398a641da72eda75f05beb8497e43a3 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 1 Nov 2018 10:57:46 +0800 Subject: [PATCH] qa: add librados3 to exclude list of pre-nautilus install tasks Signed-off-by: Kefu Chai --- .../upgrade/featureful_client/old_client/tasks/0-luminous.yaml | 1 + .../featureful_client/upgraded_client/tasks/0-luminous.yaml | 1 + qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml | 1 + qa/suites/rados/thrash-old-clients/1-install/hammer.yaml | 2 +- qa/suites/rados/thrash-old-clients/1-install/jewel.yaml | 2 +- qa/suites/rados/thrash-old-clients/1-install/luminous.yaml | 1 + .../rados/upgrade/luminous-x-singleton/1-install/luminous.yaml | 1 + .../upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml | 1 + 8 files changed, 8 insertions(+), 2 deletions(-) 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 bf627dc394c..6df131c3efb 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 bf627dc394c..6df131c3efb 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 bf627dc394c..6df131c3efb 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 b2c6b62d812..2aee309cf47 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 b68ee3d30bc..e04a61fd57e 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 1961c8914ec..d8a590f8541 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 c84176f4161..9900058541e 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 3d57f792b97..069234b8028 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: -- 2.39.5