Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qa/workunits/rbd: use more recent qemu-iotests that support Xenial #12371

Merged
merged 1 commit into from Dec 12, 2016

Conversation

dillaman
Copy link

@dillaman dillaman commented Dec 7, 2016

Fixes: http://tracker.ceph.com/issues/18149
Signed-off-by: Jason Dillaman dillaman@redhat.com

cd qemu
git checkout 2528043f1f299e0e88cb026f1ca7c40bbb4e1f80
if `lsb_release -da | grep -i xenial > /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.

@dillaman You could use grep -q option to avoid /dev/null redirect. Or just if [ "$(lsb_release -sc)" = xenial ].

Also, do you expect this to work for post xenial releases? Then might be "$(lsb_release -is)" = Ubuntu -a "$(lsb_release -rs)" '>' 16?

Copy link
Author

Choose a reason for hiding this comment

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

I've just grown used to the fact that this test needs to be updated w/ each major OS release

git checkout v2.3.0
else
# use v2.2.0-rc3 (last released version that handles all the tests
git checkout 2528043f1f299e0e88cb026f1ca7c40bbb4e1f80
Copy link
Contributor

@trociny trociny Dec 8, 2016

Choose a reason for hiding this comment

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

just wondering, can't we use v2.3.0 for all cases?

Copy link
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 -- the newer harness uses CLI options not available in the older versions.

trociny pushed a commit that referenced this pull request Dec 8, 2016
qa/workunits/rbd: use more recent qemu-iotests that support Xenial #12371

Conflicts:
	qa/workunits/rbd/qemu-iotests.sh
@trociny
Copy link
Contributor

trociny commented Dec 9, 2016

@dillaman Could you please rebase

@dillaman
Copy link
Author

dillaman commented Dec 9, 2016

@trociny rebased

cd qemu
git checkout 2528043f1f299e0e88cb026f1ca7c40bbb4e1f80
if `lsb_release -da | grep -iq xenial`; then
Copy link
Contributor

Choose a reason for hiding this comment

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

@dillaman Sorry, missed this in the previous review, actually no need to backquote here, i.e. I think it should be:

  if lsb_release -da | grep -iq xenial; then 

In your case it executes it in subshell and if it happened that it returned some output this output would be used as a command for if.

@dillaman
Copy link
Author

@trociny updated

@trociny trociny merged commit b1181c7 into master Dec 12, 2016
@dillaman dillaman deleted the wip-18149 branch December 12, 2016 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants