qa/workunits/cephtool/test.sh: FreeBSD has no distro. #11702
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tchaikov
requested changes
Nov 2, 2016
| @@ -1137,8 +1137,10 @@ function test_mon_osd() | |||
| expect_false ceph osd find xyz | |||
| expect_false ceph osd find 0.1 | |||
| ceph --format plain osd find 1 # falls back to json-pretty | |||
| ceph osd metadata 1 | grep 'distro' | |||
| ceph --format plain osd metadata 1 | grep 'distro' # falls back to json-pretty | |||
| if [ `uname` != FreeBSD ]; then | |||
There was a problem hiding this comment.
the distro info collected by ceph osd metadata comes from the output lsb_release(1), which in turn is a Linux specific command. so, maybe we should put something like:
if [ `uname` == Linux ]; then
...
fiThere was a problem hiding this comment.
@tchaikov
That is the alternative, but it excludes any other platform that is going to try to be Linux compatible and does have lsb_release.
I've also considered to "tweak" the lsb-data gathering, but then this is only informational and could set people on the wrong foot, thinking they can do more processing with it Linux-style.
And then the mis-information only propagates further.
So please confirm you want the Linux-test
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
wjwithagen
force-pushed
the
wip-wjw-freebsd-cephtool-test
branch
from
7a5d797
to
e1993ea
Compare
|
@tchaikov |
tchaikov
approved these changes
Nov 2, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Willem Jan Withagen wjw@digiware.nl