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

Leo6Leo · 2025-07-23T15:40:22Z

Description

Rename Dockerfile from Dockerfile.rhel7 to Dockerfile.ocp

openshift-ci-robot · 2025-07-23T15:40:27Z

@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.

Details

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 · 2025-07-23T15:40:45Z

[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.

Details

Needs approval from an approver in each of these files:

OWNERS

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

jhadvig

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 · 2025-07-24T20:40:33Z

/cc @jhadvig

Leo6Leo · 2025-07-24T20:42:38Z

Dockerfile.ocp

@@ -0,0 +1,33 @@
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder


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

Leo6Leo · 2025-07-24T20:48:10Z

/hold just to be safe

cajieh · 2025-07-25T19:45:52Z

README.md

 # 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 .


@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 · 2025-07-29T13:16:58Z

/retest

Leo6Leo · 2025-07-30T14:06:15Z

/retest

Leo6Leo · 2025-07-31T23:30:00Z

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

The Problem Chain:

This console-operator PR: Changed Makefile to reference Dockerfile.ocp
CI configuration: Still expects Dockerfile.rhel7
Build failure: CI can't find expected Dockerfile which is Dockerfile.rhel7
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 · 2025-08-01T12:52:15Z

/retest

README.md

Co-authored-by: Jon Jackson <jonjacks@redhat.com>

Leo6Leo · 2025-08-05T12:52:20Z

/retest-required

Leo6Leo · 2025-08-11T14:04:35Z

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 · 2025-08-21T23:51:17Z

/retest

openshift-ci · 2025-08-22T03:04:18Z

@Leo6Leo: all tests passed!

Full PR test history. Your PR dashboard.

Details

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 · 2025-08-25T18:32:13Z

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

Leo6Leo · 2025-08-25T18:36:54Z

/jira refresh

openshift-ci-robot · 2025-08-25T18:36:59Z

@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.

Details

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.

openshift-bot · 2025-11-24T01:01:15Z

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

openshift-bot · 2025-12-24T08:30:44Z

Stale issues rot after 30d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle rotten
/remove-lifecycle stale

fix: rename Dockerfile

cd95204

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 bot requested review from jhadvig and spadgett July 23, 2025 15:40

Leo6Leo mentioned this pull request Jul 23, 2025

OCPBUGS-36520: Update Dockerfile path for console operator release 4.17 openshift/release#67416

Closed

jhadvig requested changes Jul 24, 2025

View reviewed changes

feat: add back the Dockerfile.rhel7 for CI compatibility

f88c192

openshift-ci bot requested a review from jhadvig July 24, 2025 20:40

Leo6Leo commented Jul 24, 2025

View reviewed changes

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 reviewed Jul 25, 2025

View reviewed changes

fix: update README to use placeholder for username in Docker commands

cea65ba

Leo6Leo requested a review from cajieh July 28, 2025 15:53

fix: revert Makefile to use Dockerfile.rhel7 for image build

cd624a1

TheRealJon reviewed Aug 1, 2025

View reviewed changes

README.md Outdated Show resolved Hide resolved

Update README.md

64dc631

Co-authored-by: Jon Jackson <jonjacks@redhat.com>

Leo6Leo changed the title ~~OCPBUGS-36520: Rename Dockerfile to .ocp~~ [release-4.17] OCPBUGS-36520: Rename Dockerfile to .ocp Aug 21, 2025

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

openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Nov 24, 2025

openshift-ci bot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Dec 24, 2025

		@@ -0,0 +1,33 @@
		FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder

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

Are you sure you want to change the base?

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

Uh oh!

Conversation

Leo6Leo commented Jul 23, 2025

Description

Uh oh!

openshift-ci-robot commented Jul 23, 2025

Description

Uh oh!

openshift-ci bot commented Jul 23, 2025

Uh oh!

jhadvig left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Leo6Leo commented Jul 24, 2025

Uh oh!

Leo6Leo Jul 24, 2025

Choose a reason for hiding this comment

Uh oh!

Leo6Leo commented Jul 24, 2025

Uh oh!

cajieh Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

Leo6Leo commented Jul 29, 2025

Uh oh!

Leo6Leo commented Jul 30, 2025

Uh oh!

Leo6Leo commented Jul 31, 2025

Uh oh!

Leo6Leo commented Aug 1, 2025

Uh oh!

Uh oh!

Leo6Leo commented Aug 5, 2025

Uh oh!

Leo6Leo commented Aug 11, 2025

Uh oh!

Leo6Leo commented Aug 21, 2025

Uh oh!

openshift-ci bot commented Aug 22, 2025

Uh oh!

Leo6Leo commented Aug 25, 2025

Uh oh!

Leo6Leo commented Aug 25, 2025

Uh oh!

openshift-ci-robot commented Aug 25, 2025

Uh oh!

openshift-bot commented Nov 24, 2025

Uh oh!

openshift-bot commented Dec 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

jhadvig left a comment •

edited

Loading