Skip to content

qa/workunits/cephadm/test_cephadm: some cleanup#39097

Merged
liewegas merged 6 commits intoceph:masterfrom
liewegas:cephadm-simplify-test-python
Jan 30, 2021
Merged

qa/workunits/cephadm/test_cephadm: some cleanup#39097
liewegas merged 6 commits intoceph:masterfrom
liewegas:cephadm-simplify-test-python

Conversation

@liewegas
Copy link
Member

  • don't pull old images
  • remove cruft for testing python2

We aren't supporting python2 anymore.

Signed-off-by: Sage Weil <sage@newdream.net>
…ceph.io

No reason to pull nautilus/mimic, which don't even support cephadm.

This test will mostly run in the sepia lab, so pull from there.

Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Sage Weil <sage@newdream.net>
Copy link
Contributor

@mgfritch mgfritch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one minor suggestion, otherwise lgtm!

local units="nfs-server nfs-kernel-server"
for unit in $units; do
if systemctl status $unit; then
if systemctl status $unit < /dev/null; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if systemctl status $unit < /dev/null; then
if systemctl status $unit > /dev/null; then

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried that first, but it doesn't prevent systemctl status from launching the pager; > does

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe systemctl --no-pager ?

Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Sage Weil <sage@newdream.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants