Skip to content

Commit

Permalink
qa/suites: add librados2 to "extra_packages" for upgrade tests
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
tchaikov committed Nov 15, 2018
1 parent eaf8e40 commit ae36a61
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ tasks:
- install:
branch: luminous
exclude_packages: ['librados3']
extra_packages: ['librados2']
- print: "**** done installing luminous"
- ceph:
log-whitelist:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ tasks:
- install:
branch: luminous
exclude_packages: ['librados3']
extra_packages: ['librados2']
- print: "**** done installing luminous"
- ceph:
log-whitelist:
Expand Down
1 change: 1 addition & 0 deletions qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ tasks:
- install:
branch: luminous
exclude_packages: ['librados3']
extra_packages: ['librados2']
- print: "**** done installing luminous"
- ceph:
log-whitelist:
Expand Down
1 change: 1 addition & 0 deletions qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
1 change: 1 addition & 0 deletions qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
1 change: 1 addition & 0 deletions qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ tasks:
- install:
branch: luminous
exclude_packages: ['librados3']
extra_packages: ['librados2']
- install.upgrade:
mon.a:
mon.b:
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ tasks:
- install:
branch: luminous
exclude_packages: ['librados3']
extra_packages: ['librados2']
- print: "**** done install luminous"
- ceph:
- print: "**** done ceph"
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ tasks:
- install:
branch: mimic
exclude_packages: ['librados3']
extra_packages: ['librados2']
- print: "**** done installing mimic"
- ceph:
log-whitelist:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ tasks:
- install:
branch: mimic
exclude_packages: ['librados3']
extra_packages: ['librados2']
- print: "**** done install mimic"
- ceph:
- exec:
Expand Down

0 comments on commit ae36a61

Please sign in to comment.