Automatic backport of pull request #3055 #3521
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
This condition is useless and it's also creating issues we don't see in our CI. ceph_release is set by either ceph-common or ceph-docker-common so let's keep it this way. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1645379 (cherry picked from commit e9188cd) Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
This part of the code is not needed since ceph-ansible@master is intended to deploy ceph@master only. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com> (cherry picked from commit 1bbdde2)
guits
force-pushed
the
mergify/bp/stable-3.2/pr-3055
branch
from
ac67378
to
d43d817
Compare
when `ceph_origin` is set to `'repository'` and `ceph_repository` to `'community'` we need to ensure `ceph_release` reflect `ceph_stable_release`. 4a3f180 simply removed the override while it should just have to be run only when the condition mentioned above is satisfied. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com> (cherry picked from commit 0bfefdd)
|
jenkins test luminous-centos7_cluster |
|
jenkins test pipeline |
guits
approved these changes
Jan 24, 2019
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.
This is an automated backport of pull request #3055 done by Mergify.io
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1645379