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

Disable btrfs for RHEL in podman spec #4587

Merged
merged 1 commit into from Nov 29, 2019
Merged

Disable btrfs for RHEL in podman spec #4587

merged 1 commit into from Nov 29, 2019

Conversation

raukadah
Copy link
Contributor

Since btrfs-progs-devel is not available in RHEL8 and the spec
fails to build it. Making the btrfs conditional in spec file
as well as build_rpm.sh fixes the issue.

Signed-off-by: Chandan Kumar (raukadah) raukadah@gmail.com

@openshift-ci-robot
Copy link
Collaborator

Hi @raukadah. Thanks for your PR.

I'm waiting for a containers member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S and removed size/S labels Nov 28, 2019
@rhatdan
Copy link
Member

rhatdan commented Nov 28, 2019

I would prefer that we do this in the contrib/spec rather then put intelligence into the the main line code for Red Hat.

@raukadah
Copy link
Contributor Author

raukadah commented Nov 28, 2019

@rhatdan In TripleO CI side, on RHEL-8, we wanted to use bash ./contrib/build_rpm.sh script to generate the rpm from checked out patch, so that required dependencies should be automatically gets installed in CI, we checked that part also.

Since btrfs-progs-devel is not available in RHEL/CentOS 8 and
the spec fails to build it while running build_rpm.sh,
making it optional fixes the issue.

It also modifies the spec file to install btrfs-progs-devel for
fedora only.

Since golang-github-cpuguy83-go-md2man was added twice, it also
removes the repetition.

Signed-off-by: Chandan Kumar (raukadah) <raukadah@gmail.com>
@giuseppe
Copy link
Member

LGTM

@raukadah
Copy link
Contributor Author

/assign @baude

@ssbarnea
Copy link
Collaborator

@rhatdan In TripleO CI side, on RHEL-8, we wanted to use bash ./contrib/build_rpm.sh script to generate the rpm from checked out patch, so that required dependencies should be automatically gets installed in CI, we checked that part also.

Longer term it would be nice to add a make rpm target that runs this bash script and that works on all supported platforms (CenOS, RHEL, Fedora). Our OpenStack jobs will help keeping this green. Still, that should in follow-ups.

@rhatdan
Copy link
Member

rhatdan commented Nov 29, 2019

Thanks @raukadah
/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 29, 2019
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: raukadah, rhatdan, ssbarnea

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 29, 2019
@openshift-merge-robot openshift-merge-robot merged commit 1c0356e into containers:master Nov 29, 2019
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 26, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants