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

jewel: build/ops: install-deps.sh based on /etc/os-release #12405

Merged
merged 4 commits into from Feb 1, 2017

Conversation

jan--f
Copy link
Contributor

@jan--f jan--f commented Dec 9, 2016

@jan--f
Copy link
Contributor Author

jan--f commented Dec 9, 2016

@smithfarm
Copy link
Contributor

original description

Avoid shaky distro detection by package manager. Use /etc/os-release instead.

Fixed by commits
85a370e
fd37e87

and present in master and Kraken.

Would be useful to have this in Jewel too.

@smithfarm
Copy link
Contributor

@jan--f Please get rid of the merge commit.

@smithfarm smithfarm added this to the jewel milestone Dec 15, 2016
@smithfarm smithfarm self-assigned this Dec 15, 2016
@smithfarm
Copy link
Contributor

@dachary IIRC there is nothing in the integration test suites that exercises install-deps.sh, correct?

@smithfarm
Copy link
Contributor

@jan--f Please rebase to the latest jewel (i.e. something like git fetch ceph ; git rebase ceph/jewel ; git push -f)

@smithfarm
Copy link
Contributor

The tox test failure is benign.

Jan Fajerski and others added 2 commits December 15, 2016 22:02
This avoids initial distribution detection (before lsb_release is available)
based on the presence of a specific package manager. This caused an
issue with openSUSE Tumbleweed before since both zypper and apt-get are
available.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 85a370e)
85a370e introduced the DISTRO variable whose
value was obtained by parsing /etc/os-release like this:

DISTRO=$(grep  "^ID=" /etc/os-release | sed "s/ID=//")

This unfortunately picks up the double-quotes, so on a CentOS system DISTRO
will be equal to '"centos"'.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit fd37e87)
@smithfarm
Copy link
Contributor

Jenkins, retest this please

@smithfarm
Copy link
Contributor

@jan--f Please cherry-pick 266f4d4 into this PR. When you do please remind me to:

Nitin A Kamble and others added 2 commits January 10, 2017 09:40
Avoids this error on SLES systems:

> ./install-deps.sh
sles is unknown, dependencies will have to be installed manually.

Signed-off-by: Nitin A Kamble <Nitin.Kamble@Teradata.com>
(cherry picked from commit 266f4d4)

    Conflict in install-deps.sh due to indentation. Trivial resolution.
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
@jan--f
Copy link
Contributor Author

jan--f commented Jan 10, 2017

@smithfarm
Copy link
Contributor

Jenkins, retest this please

@smithfarm
Copy link
Contributor

@jan--f Excellent, thanks!

@ghost ghost changed the title build/ops: install-deps.sh based on /etc/os-release jewel: build/ops: install-deps.sh based on /etc/os-release Jan 12, 2017
@smithfarm smithfarm merged commit 9c83af8 into ceph:jewel Feb 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants