From ae36a614465dc4ddba830ca9a89d1d106ee8890b Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 15 Nov 2018 11:34:29 +0800 Subject: [PATCH] qa/suites: add librados2 to "extra_packages" for upgrade tests we use the playbook of "testnodes.yml" defined by ceph-cm-ansible for initializing test nodes, and the role of "testnode" is used by testnodes.yml. "testnode" requires "qemu-system-x86" or "qemu-kvm" package to be installed. the qemu in turn depends on librbd1 and librados2. before librados3 was introduced, this worked perfectly. because in ceph repo, qa/packages/packages.yaml defines the default set of packages the "install" tasks should install. and in that yaml file, librados2 was listed. so the package management system will overwrite the librados2 installed by ansible playbook with the version specified by the "install" task, as apt/yum thinks this is what user requires explicitly, so it's fine to install a different version of librados2. after librados3 was introduced, librados2 was removed from qa/packages/packages.yaml. because, by default, we need to install librados3 instead of librados2 for ready a nautilus cluster. but the problem is, the packge list also applies to "install" tasks installing releases before nautilus, where we still need to replace the librados2 installed by ansible. so, to address this issue, "librados2" is added to "extra_packages" of the "install" tasks of tests installing old releases to install librados2 explicitly instead of as a dependency of other ceph packages like librbd1. 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 | 1 + qa/suites/rados/thrash-old-clients/1-install/jewel.yaml | 1 + qa/suites/rados/thrash-old-clients/1-install/luminous.yaml | 1 + .../rados/upgrade/luminous-x-singleton/1-install/luminous.yaml | 1 + qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml | 1 + qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml | 1 + 9 files changed, 9 insertions(+) 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 6df131c3efb..fd133f2158f 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 @@ -5,6 +5,7 @@ tasks: - install: branch: luminous exclude_packages: ['librados3'] + extra_packages: ['librados2'] - 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 6df131c3efb..fd133f2158f 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 @@ -5,6 +5,7 @@ tasks: - install: branch: luminous exclude_packages: ['librados3'] + extra_packages: ['librados2'] - 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 6df131c3efb..fd133f2158f 100644 --- a/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml +++ b/qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml @@ -5,6 +5,7 @@ tasks: - install: branch: luminous exclude_packages: ['librados3'] + extra_packages: ['librados2'] - 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 2aee309cf47..e07591617dd 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml @@ -10,6 +10,7 @@ tasks: - install: branch: hammer exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev', 'librados3', 'libradospp-devel'] + extra_packages: ['librados2'] - 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 e04a61fd57e..755b5da9dbc 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml @@ -2,6 +2,7 @@ tasks: - install: branch: jewel exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev', 'librados3'] + extra_packages: ['librados2'] - 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 d8a590f8541..686001ee871 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml @@ -2,6 +2,7 @@ tasks: - install: branch: luminous exclude_packages: ['librados3'] + extra_packages: ['librados2'] - 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 9900058541e..9332a0ef0f5 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 @@ -9,6 +9,7 @@ tasks: - install: branch: luminous exclude_packages: ['librados3'] + extra_packages: ['librados2'] - print: "**** done install luminous" - ceph: - print: "**** done 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 9779a00b21f..f5f1e395596 100644 --- a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml +++ b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml @@ -7,6 +7,7 @@ tasks: - install: branch: mimic exclude_packages: ['librados3'] + extra_packages: ['librados2'] - print: "**** done installing mimic" - ceph: log-whitelist: 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 b4b9b6fceff..ec9f3bee75a 100644 --- 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 @@ -4,6 +4,7 @@ tasks: - install: branch: mimic exclude_packages: ['librados3'] + extra_packages: ['librados2'] - print: "**** done install mimic" - ceph: - exec: -- 2.39.5