Skip to content

Conversation

elmiko
Copy link

@elmiko elmiko commented Aug 26, 2020

What this PR does / why we need it:

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/blob/master/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-master.yaml
and
https://github.com/openshift/ocp-build-data/blob/openshift-4.6/images/ose-openstack-machine-controllers.yml
should be updated with the new dockerfile path.

Which issue(s) this PR fixes
Bugzilla 1872080

…build-data

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/blob/master/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-master.yaml
and
https://github.com/openshift/ocp-build-data/blob/openshift-4.6/images/ose-openstack-machine-controllers.yml
should be updated with the new dockerfile path.
@openshift-ci-robot openshift-ci-robot added 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. labels 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
Copy link

@elmiko: This pull request references Bugzilla bug 1872080, which is valid.

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.

1 similar comment
@openshift-ci-robot
Copy link

@elmiko: This pull request references Bugzilla bug 1872080, which is valid.

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.

@elmiko
Copy link
Author

elmiko commented Aug 26, 2020

this patch is intended to replace #113 , 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.

after this has merged and we have updated the related configurations, we could examine deprecating the .rhel7 file when it is no longer needed.

@elmiko
Copy link
Author

elmiko commented Aug 26, 2020

/test e2e-openstack

@mandre
Copy link
Member

mandre commented Aug 27, 2020

/approve
/retest

@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 27, 2020
@mandre
Copy link
Member

mandre commented Aug 27, 2020

Hi @elmiko, thanks for the patch. This is indeed a better solution if it allows OKD to continue building the images. Will you take care of updating the configs in the release and ocp-build-data repos to point to the new Dockerfile once the patch merges or should we?

@elmiko
Copy link
Author

elmiko commented Aug 27, 2020

hi @mandre , i will create a patch to update the ocp-build-data and the release repo once this patch lands. to make things simple i am going to coordinate with the other PRs i've placed on the machine-api provider components. so it might take a few days depending on when things merge.

my goal is to have all this merged during our current sprint (within the next 2 weeks).

@elmiko
Copy link
Author

elmiko commented Aug 27, 2020

/retest

@iamemilio
Copy link

We are having issues with our test infra right now

@crawford
Copy link

crawford commented Sep 1, 2020

/retest

@crawford
Copy link

crawford commented Sep 1, 2020

/retest

@enxebre
Copy link
Member

enxebre commented Sep 2, 2020

/retest
/lgtm

@openshift-ci-robot
Copy link

@enxebre: changing LGTM is restricted to collaborators

In response to this:

/retest
/lgtm

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

for some reason Alberto's lgtm didn't get picked up, re-adding

/lgtm

@openshift-ci-robot
Copy link

@elmiko: you cannot LGTM your own PR.

In response to this:

for some reason Alberto's lgtm didn't get picked up, re-adding

/lgtm

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 added a commit to elmiko/ocp-build-data that referenced this pull request Sep 2, 2020
@elmiko
Copy link
Author

elmiko commented Sep 2, 2020

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

@pierreprinetti
Copy link
Member

/retest

@pierreprinetti
Copy link
Member

/lgtm
/hold until CI succeeds

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 2, 2020
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 2, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elmiko, enxebre, mandre, michaelgugino, pierreprinetti

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:
  • OWNERS [mandre,pierreprinetti]

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

@elmiko
Copy link
Author

elmiko commented Sep 2, 2020

/test e2e-openstack

1 similar comment
@elmiko
Copy link
Author

elmiko commented Sep 2, 2020

/test e2e-openstack

@crawford
Copy link

crawford commented Sep 2, 2020

OpenStack CI is in the process of switching between infrastructure providers, so CI might not be giving us a great signal. Looking at the most recent failure, I see etcd having trouble forming quorum due to load on the machine. I'm pretty comfortable moving forward with this anyway.

/override ci/prow/e2e-openstack
/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 2, 2020
@openshift-ci-robot
Copy link

@crawford: Overrode contexts on behalf of crawford: ci/prow/e2e-openstack

In response to this:

OpenStack CI is in the process of switching between infrastructure providers, so CI might not be giving us a great signal. Looking at the most recent failure, I see etcd having trouble forming quorum due to load on the machine. I'm pretty comfortable moving forward with this anyway.

/override ci/prow/e2e-openstack
/hold cancel

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

thanks for the help Alex!

@openshift-merge-robot openshift-merge-robot merged commit 5f59055 into openshift:master Sep 2, 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.

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.

9 participants