Skip to content

[release-4.17] OCPBUGS-36520: Rename Dockerfile to .ocp #1023

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 5 commits into
base: release-4.17
Choose a base branch
from
Open

[release-4.17] OCPBUGS-36520: Rename Dockerfile to .ocp #1023

wants to merge 5 commits into from

Conversation

Leo6Leo
Copy link
Contributor

@Leo6Leo Leo6Leo commented Jul 23, 2025

Description

Rename Dockerfile from Dockerfile.rhel7 to Dockerfile.ocp

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 23, 2025
@openshift-ci-robot
Copy link
Contributor

@Leo6Leo: This pull request references Jira Issue OCPBUGS-36520, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected Jira Issue OCPBUGS-36520 to depend on a bug targeting a version in 4.18.0, 4.18.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Description

Rename Dockerfile from Dockerfile.rhel7 to Dockerfile.ocp

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from jhadvig and spadgett July 23, 2025 15:40
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jul 23, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Leo6Leo
Once this PR has been reviewed and has the lgtm label, please assign therealjon for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@Leo6Leo Leo6Leo mentioned this pull request Jul 23, 2025
Open
jhadvig
jhadvig requested changes Jul 24, 2025
View reviewed changes
Copy link
Member

@jhadvig jhadvig left a comment •
edited
Loading

Choose a reason for hiding this comment

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

We need to duplicate the Dockerfile, in order to avoid CI failures, until we do followup changes in the release repo. After those are in, we can remove the original Dockerfile.rhel7

@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Jul 24, 2025

/cc @jhadvig

@openshift-ci openshift-ci bot requested a review from jhadvig July 24, 2025 20:40
Leo6Leo
Leo6Leo commented Jul 24, 2025
View reviewed changes
Dockerfile.ocp
@@ -0,0 +1,33 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the duplicate of Dockerfile.rhel7, just with different name.

@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Jul 24, 2025

/hold just to be safe

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 24, 2025
cajieh
cajieh reviewed Jul 25, 2025
View reviewed changes
README.md Outdated
# for development, you are going to push to an alternate registry.
# specifically it can look something like this:
docker build -f Dockerfile.rhel7 -t quay.io/benjaminapetersen/console-operator:latest .
docker build -f Dockerfile.ocp -t quay.io/benjaminapetersen/console-operator:latest .
Copy link
Contributor

Choose a reason for hiding this comment

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

@Leo6Leo Would it be clearer to replace the benjaminapetersen with a placeholder like <your-username>. Also, this appears in multiple places in the file.

@Leo6Leo Leo6Leo requested a review from cajieh July 28, 2025 15:53
@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Jul 29, 2025

/retest

1 similar comment
@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Jul 30, 2025

/retest

@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Jul 31, 2025

Update: Based on my research and understanding, this is my planning for the next move.

The Problem Chain:

  1. This console-operator PR: Changed Makefile to reference Dockerfile.ocp
  2. CI configuration: Still expects Dockerfile.rhel7
  3. Build failure: CI can't find expected Dockerfile which is Dockerfile.rhel7
  4. No tests run: Build fails before e2e tests start

So what I will be doing is:

  • 1. Update this PR to revert the changes in the Makefile.
    • At this point, the CI should already start passing since the CI is looking for Dockerfile.rhel7 instead of Dockerfile.ocp.
  • 2. Merge this PR
  • 3. Merge the PR in openshift/release to update the CI OCPBUGS-36520: Update Dockerfile path for console operator release 4.17 release#67416
    • At this point after the PR above get merged, the CI on the new PRs should start failing since the CI will now be looking for Dockerfile.ocp instead of Dockerfile.rhel7
  • 4. Open a new PR to modify the Makefile, and at that point the CI on the new PR should be passing.

@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Aug 1, 2025

/retest

TheRealJon
TheRealJon reviewed Aug 1, 2025
View reviewed changes
@Leo6Leo @TheRealJon
Update README.md
64dc631 
Co-authored-by: Jon Jackson <jonjacks@redhat.com>
@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Aug 5, 2025

/retest-required

@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Aug 11, 2025

The CI test e2e-aws-console seems failing constantly, and it is failing across all the PRs that intends to merge commits to release 4.17 branch. Currently investigating.

@Leo6Leo Leo6Leo changed the title OCPBUGS-36520: Rename Dockerfile to .ocp [release-4.17] OCPBUGS-36520: Rename Dockerfile to .ocp Aug 21, 2025
@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Aug 21, 2025

/retest

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Aug 22, 2025

@Leo6Leo: all tests passed!

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Aug 25, 2025

/unhold The test is passing. openshift/release#67416 will be unhold after this PR get merged.

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 25, 2025
@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Aug 25, 2025

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@Leo6Leo: This pull request references Jira Issue OCPBUGS-36520, which is invalid:

  • expected Jira Issue OCPBUGS-36520 to depend on a bug targeting a version in 4.18.0, 4.18.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheRealJon TheRealJon TheRealJon left review comments

@spadgett spadgett Awaiting requested review from spadgett

@jhadvig jhadvig Awaiting requested review from jhadvig

@cajieh cajieh Awaiting requested review from cajieh

Assignees
No one assigned
Labels
jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Leo6Leo @openshift-ci-robot @jhadvig @cajieh @TheRealJon