NO-ISSUE: UPSTREAM: <carry>: remove dead e2e registry push job and related variables

[joelanford]

Summary

• Remove the push Job and route from openshift/operator-controller/build-test-registry.sh (upstream's testdata/push/push.go is now a no-op stub)
• Drop E2E_REGISTRY_IMAGE argument from build-test-registry.sh invocations in openshift/Makefile
• Remove unused Makefile variables: REG_PKG_NAME, E2E_TEST_CATALOG_V1, E2E_TEST_CATALOG_V2, CATALOG_IMG, LOCAL_REGISTRY_HOST

Test plan

• Verify e2e tests pass in CI without the removed variables and push job

Summary by CodeRabbit

• Chores
  • Simplified OpenShift e2e test setup by removing several exported registry/configuration variables.
  • Streamlined test-registry tooling: CLI now requires only namespace and name; the image positional argument is removed.
  • Removed image-push jobs and route creation/printing from the test-registry flow.
  • Updated inline notes to indicate the prior registry image setting remains present but is no longer used.

[coderabbitai]

Walkthrough

Removed exported e2e catalog/registry variables and route-derived LOCAL_REGISTRY_HOST from the OpenShift Makefile. The build-test-registry.sh script now requires only NAMESPACE and NAME (positional IMAGE removed) and no longer creates/waits for an image-push Job or creates/prints an OpenShift Route.

Changes

Cohort / File(s)	Summary
Makefile Test Registry Configuration openshift/Makefile	Deleted exported variables REG_PKG_NAME, E2E_TEST_CATALOG_V1, E2E_TEST_CATALOG_V2, and CATALOG_IMG. Removed inline resolution of LOCAL_REGISTRY_HOST via oc route query. Updated test-e2e / test-experimental-e2e invocations to omit $(E2E_REGISTRY_IMAGE) when calling the registry builder script.
Build Test Registry Script openshift/operator-controller/build-test-registry.sh	CLI contract changed to require 2 positional args (NAMESPACE, NAME); removed IMAGE argument handling and help text. Script still applies Namespace/Deployment/Service and waits for Deployment availability, but no longer creates or waits for an image-push Job and no longer creates/prints an OpenShift Route.

Sequence Diagram(s)

sequenceDiagram
    autonumber
    participant Makefile
    participant Script as build-test-registry.sh
    participant OpenShift as "OpenShift API (oc)"
    participant Deployment as "Registry Deployment"
    Note over Makefile,Script: Old flow (left) vs New flow (right)

    rect rgba(200,200,255,0.5)
      Makefile->>Script: invoke with NAMESPACE, NAME, IMAGE (old)
      Script->>OpenShift: apply Namespace/Deployment/Service
      Script->>Deployment: wait for Available
      Script->>OpenShift: create Job (push image)
      OpenShift->>Script: Job completes
      Script->>OpenShift: create Route and print host
    end

    rect rgba(200,255,200,0.5)
      Makefile->>Script: invoke with NAMESPACE, NAME (new)
      Script->>OpenShift: apply Namespace/Deployment/Service
      Script->>Deployment: wait for Available
      Note right of Script: no Job creation, no Route creation/printing
    end

Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

🚥 Pre-merge checks | ✅ 12

✅ Passed checks (12 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly and specifically describes the main change: removing dead e2e registry push job and related variables from the codebase.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names	✅ Passed	The pull request modifies only infrastructure files (Makefile and shell script) with no Ginkgo test definitions or modifications.
Test Structure And Quality	✅ Passed	Custom check for Ginkgo test code quality is not applicable; PR only modifies build configuration files, not test files.
Microshift Test Compatibility	✅ Passed	This PR does not add any new Ginkgo e2e tests. Changes are infrastructure-focused: removing dead code and cleaning up unused variables.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	This pull request does not add any new Ginkgo e2e tests. The changes only modify infrastructure files (openshift/Makefile and build-test-registry.sh) to remove unused registry variables and simplify test setup logic.
Topology-Aware Scheduling Compatibility	✅ Passed	Pull request removes test infrastructure code and unused variables without introducing any new scheduling constraints or topology assumptions.
Ote Binary Stdout Contract	✅ Passed	The OTE Binary Stdout Contract check is not applicable to this PR as it modifies only Makefile and bash infrastructure setup, not Go binary code.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	This PR does not add any new Ginkgo e2e tests. Changes are only to build infrastructure files (Makefile and shell script), not test code.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{Review rate limit: 9/10 reviews remaining, refill in 6 minutes.}

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joelanford

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• DOWNSTREAM_OWNERS [joelanford]

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]

@joelanford: This pull request explicitly references no jira issue.

Details

In response to this:

Summary

• Remove the push Job and route from openshift/operator-controller/build-test-registry.sh (upstream's testdata/push/push.go is now a no-op stub)
• Drop E2E_REGISTRY_IMAGE argument from build-test-registry.sh invocations in openshift/Makefile
• Remove unused Makefile variables: REG_PKG_NAME, E2E_TEST_CATALOG_V1, E2E_TEST_CATALOG_V2, CATALOG_IMG, LOCAL_REGISTRY_HOST

Test plan

• Verify e2e tests pass in CI without the removed variables and push job

Summary by CodeRabbit

• Chores
• Simplified OpenShift end-to-end test infrastructure by removing redundant registry configuration variables and streamlining the test registry deployment process.

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.

[joelanford]

/retest

[tmshort]

/retest

[tmshort]

/retest

[tmshort]

/test e2e-gcp-ovn-upgrade

[tmshort]

/lgtm

[tmshort]

/hold
Until openshift/release#78581 is in

[dtfranz]

/retest

[joelanford]

Rollout plan

1. This PR — Remove dead Makefile variables (REG_PKG_NAME, E2E_TEST_CATALOG_V1/V2, CATALOG_IMG, LOCAL_REGISTRY_HOST), drop the E2E_REGISTRY_IMAGE argument from build-test-registry.sh calls, and remove the push Job and route from the script.
2. openshift/release PR (draft) — Remove the e2e-test-registry image build and E2E_REGISTRY_IMAGE dependencies from the CI config.
3. Follow-up PR (this repo) — Once the release PR merges, delete openshift/registry.Dockerfile.
4. Upstream PR — Delete the no-op stubs (testdata/push/ and testdata/build-test-registry.sh) that existed for downstream backward compatibility. This will eventually sync down to this repo.

[dtfranz]

/lgtm
/retest

[joelanford]

/hold cancel

We actually need this PR to merge before the openshift/release PR.

[coderabbitai]

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@openshift/operator-controller/build-test-registry.sh`:
- Line 17: The arg-count check currently rejects any invocation with three args
by using the exact-match condition 'if [[ "$#" -ne 2 ]]; then'; change that to
require a minimum of two args instead (e.g., use a "less than 2" check on "$#")
so the script accepts an optional third legacy argument, leaving the rest of the
script behavior unchanged (update the conditional that contains 'if [[ "$#" -ne
2 ]]; then' to a minimum-args check).

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: dad81d7d-0d99-4e56-88cc-629cff3c54d2

📥 Commits

Reviewing files that changed from the base of the PR and between 6fc27c0 and 2648821.

📒 Files selected for processing (2)

• openshift/Makefile
• openshift/operator-controller/build-test-registry.sh

🚧 Files skipped from review as they are similar to previous changes (1)

• openshift/Makefile

[tmshort]

/lgtm

[openshift-ci]

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

[tmshort]

/verified by tshort
The CI tests passed, so I'm considering this verified.

[openshift-ci-robot]

@tmshort: This PR has been marked as verified by tshort.

Details

In response to this:

/verified by tshort
The CI tests passed, so I'm considering this verified.

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.