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

Bug 1872080: Add Dockerfile.rhel to match build configuration in ocp-build-data #102

Merged
merged 1 commit into from Aug 26, 2020

Conversation

elmiko
Copy link

@elmiko elmiko commented Aug 26, 2020

This change adds a new Dockerfile.rhel file to control builds that
target rhel. It is inspired by the automatically generated patches which
ensure that build files match what is in the
ocp-build-data repository
used for producing release artifacts.

After this change merges, the configuration files in
https://github.com/openshift/release/tree/master/ci-operator/config/openshift/cluster-api-provider-baremetal
and
https://github.com/openshift/ocp-build-data/blob/openshift-4.6/images/baremetal-machine-controller.yml
should be updated with the new dockerfile path.

This change adds a new Dockerfile.rhel file to control builds that
target rhel. It is inspired by the automatically generated patches which
ensure that build files match what is in the
[ocp-build-data repository](https://github.com/openshift/ocp-build-data/tree/openshift-4.6-rhel-8/images)
used for producing release artifacts.

After this change merges, the configuration files in
https://github.com/openshift/release/tree/master/ci-operator/config/openshift/cluster-api-provider-baremetal
and
https://github.com/openshift/ocp-build-data/blob/openshift-4.6/images/baremetal-machine-controller.yml
should be updated with the new dockerfile path.
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Aug 26, 2020
@openshift-ci-robot
Copy link

@elmiko: This pull request references Bugzilla bug 1872080, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1872080: Add Dockerfile.rhel to match build configuration in ocp-build-data

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 the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Aug 26, 2020
@elmiko
Copy link
Author

elmiko commented Aug 26, 2020

this patch is intended to replace #99, the reason i am proposing a new dockerfile is to help enable our community(OKD) users to continue to build these components while not disrupting the rhel-based builds needed for our releases.

@dhellmann
Copy link

It's a shame that there's no easy way to specify variations like that in a single Dockerfile.

@elmiko I assume the community you're referring to is OKD rather than metal3 (since metal3 has a different implementation of the provider these days)?

/approve

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 26, 2020
@elmiko
Copy link
Author

elmiko commented Aug 26, 2020

It's a shame that there's no easy way to specify variations like that in a single Dockerfile.

++

@elmiko I assume the community you're referring to is OKD rather than metal3 (since metal3 has a different implementation of the provider these days)?

yea, sorry for the ambiguity. i'll update, thanks =)

Copy link

@michaelgugino michaelgugino left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 26, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhellmann, elmiko, michaelgugino

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-merge-robot openshift-merge-robot merged commit ece8cbc into openshift:master Aug 26, 2020
@openshift-ci-robot
Copy link

@elmiko: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state.

Bugzilla bug 1872080 has not been moved to the MODIFIED state.

In response to this:

Bug 1872080: Add Dockerfile.rhel to match build configuration in ocp-build-data

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.

@elmiko
Copy link
Author

elmiko commented Sep 2, 2020

adding a reference to the dependent PR, openshift-eng/ocp-build-data#636

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants