OCPSTRAT-3036: Open Deduplicate and use the jessie image by jacobsee · Pull Request #31281 · openshift/origin

jacobsee · 2026-06-10T20:22:14Z

Summary by CodeRabbit

Bug Fixes
- Prevented duplicate image mirror entries by deduplicating injected mappings against existing generated mappings.
- Injection now skips adding mappings when equivalent destination references are already present.
- Mirrored-mode output formatting for source/destination mappings was adjusted for consistency.
- Updated the default test image reference used in generated mappings to a newer compatible image.

openshift-merge-bot · 2026-06-10T20:22:16Z

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: automatic mode

coderabbitai · 2026-06-10T20:22:34Z

Walkthrough

RunE now passes generated mapping lines into injectNewImages; injectNewImages builds a set of existing destination image targets from those lines, skips injecting mappings whose derived destination already exists, and changes the injected mapping to registry.k8s.io/e2e-test-images/jessie-dnsutils:1.7 with mirrored-mode “from” formatted as DefaultTestImageMirrorLocation:.

Changes

Image injection deduplication

Layer / File(s)	Summary
Image injection deduplication logic and call site `pkg/cmd/openshift-tests/images/images_command.go`	`RunE` forwards generated `lines` into `injectNewImages`; `injectNewImages` now accepts `existingLines []string`, derives existing destination image references to skip duplicates, switches the injected mapping to `registry.k8s.io/e2e-test-images/jessie-dnsutils:1.7`, and formats mirrored-mode “from” as `DefaultTestImageMirrorLocation:<mirrorTag>` before checking and emitting outputs.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

openshift/origin#31263: Both PRs modify pkg/cmd/openshift-tests/images/images_command.go around the injectNewImages helper and its hardcoded image→mirror mapping.

Suggested labels

e2e-images-update

Suggested reviewers

sjenning

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 66.67% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (14 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
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	PR `#31281` changes only images_command.go and zz_generated.txt; neither contains any Ginkgo test titles (It/Describe/Context/When), so no dynamic test-name strings were introduced.
Test Structure And Quality	✅ Passed	PR `#31281` only changes pkg/cmd/openshift-tests/images/images_command.go (no Describe/It/Eventually/Consistently); there’s no Ginkgo test code to evaluate, so the quality check is not applicable.
Microshift Test Compatibility	✅ Passed	PR `#31281` changes only images_command.go and test/extended/util/image/zz_generated.txt; no new Ginkgo e2e tests added or forbidden MicroShift API usage introduced.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	PR changes pkg/cmd/openshift-tests/images/images_command.go (mirror-image injection); no Ginkgo It/Describe/Context/When tests are present/updated, so SNO test-compat check is not applicable.
Topology-Aware Scheduling Compatibility	✅ Passed	PR change is in pkg/cmd/openshift-tests/images/images_command.go; code only deduplicates mirror image mappings and contains no scheduling constraints/affinity/topologySpread/node-role logic.
Ote Binary Stdout Contract	✅ Passed	In pkg/cmd/openshift-tests/images/images_command.go, the only stdout writes are fmt.Fprintln(os.Stdout, ...) inside NewImagesCommand’s RunE closure; no main/init/TestMain/BeforeSuite/RunSpecs setup...
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PR change is in pkg/cmd/openshift-tests/images/images_command.go; it contains no Ginkgo e2e constructs (no It/Describe/Context/When), so no IPv4/external-connectivity test assumptions to flag.
No-Weak-Crypto	✅ Passed	PR only adjusts image-mirror mapping logic in images_command.go; searches of the changed file/diff found no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, crypto usage, or constant-time comparisons.
Container-Privileges	✅ Passed	PR changes are limited to pkg/cmd/openshift-tests/images/images_command.go (no YAML/JSON references to jessie tags); that file contains no hostPID/hostNetwork/hostIPC/SYS_ADMIN/allowPrivilegeEscala...
No-Sensitive-Data-In-Logs	✅ Passed	In pkg/cmd/openshift-tests/images/images_command.go, there are no klog/log/fmt logging calls, and no sensitive keywords appear in any log context (only comments/strings).
Title check	✅ Passed	The title directly reflects the main changes: deduplicating image mappings and switching to the jessie-dnsutils image as specified in the changeset.

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

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

jacobsee · 2026-06-10T21:39:35Z

/test go-verify-deps

openshift-merge-bot · 2026-06-10T21:46:18Z

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

jubittajohn · 2026-06-10T22:42:25Z

/retest

jacobsee · 2026-06-10T23:50:27Z

/retest

jacobsee · 2026-06-11T00:34:54Z

/retest

jacobsee · 2026-06-11T02:35:32Z

/retest

jacobsee · 2026-06-11T06:20:40Z

/retest

openshift-trt · 2026-06-11T10:11:26Z

Job Failure Risk Analysis for sha: 38b9897

Job Name	Failure Risk
pull-ci-openshift-origin-main-e2e-aws-ovn-microshift	High install should succeed: other This test has passed 99.40% of 3851 runs on release 5.0 [Overall] in the last week.

jubittajohn · 2026-06-11T10:17:42Z

/retest

jubittajohn · 2026-06-11T11:45:43Z

/retest

jubittajohn · 2026-06-11T11:54:22Z

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-upgrade-ovn-ipv6 openshift/kubernetes#2653
/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-ovn-dualstack-techpreview openshift/kubernetes#2653

openshift-ci · 2026-06-11T11:54:26Z

@jubittajohn: given command is invalid: at least one of the commands given is only supported on a one-command-per-comment basis, please separate out commands as multiple comments

jubittajohn · 2026-06-11T11:54:43Z

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-upgrade-ovn-ipv6 openshift/kubernetes#2653

openshift-ci · 2026-06-11T11:54:45Z

@jubittajohn: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

jubittajohn · 2026-06-11T11:57:01Z

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-upgrade-ovn-ipv6 openshift/kubernetes#2653

openshift-ci · 2026-06-11T11:57:09Z

@jubittajohn: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-upgrade-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/a8be8100-658c-11f1-90e1-908e8b79b792-0

jubittajohn · 2026-06-11T11:57:41Z

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-ovn-dualstack-techpreview openshift/kubernetes#2653

openshift-ci · 2026-06-11T11:57:57Z

@jubittajohn: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-ovn-dualstack-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c0a3c0a0-658c-11f1-9a97-5ff445dfa789-0

…plication)

jubittajohn · 2026-06-12T10:01:03Z

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-upgrade-ovn-ipv6 openshift/kubernetes#2653
/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-ovn-dualstack-techpreview openshift/kubernetes#2653

openshift-ci · 2026-06-12T10:01:06Z

@jubittajohn: given command is invalid: at least one of the commands given is only supported on a one-command-per-comment basis, please separate out commands as multiple comments

openshift-ci · 2026-06-12T10:02:21Z

@jubittajohn: An error was encountered. No known errors were detected, please see the full error message for details.

Full error message.


unable to get additional pr info from string: periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-upgrade-ovn-ipv6: string: periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-upgrade-ovn-ipv6 doesn't match expected format: org/repo#number

Please contact an administrator to resolve this issue.

jubittajohn · 2026-06-12T10:02:39Z

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-upgrade-ovn-ipv6 openshift/kubernetes#2653
/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-ovn-dualstack-techpreview openshift/kubernetes#2653

openshift-ci · 2026-06-12T10:02:44Z

@jubittajohn: An error was encountered. No known errors were detected, please see the full error message for details.

Full error message.


unable to get additional pr info from string: /payload-job-with-prs: string: /payload-job-with-prs doesn't match expected format: org/repo#number

Please contact an administrator to resolve this issue.

jubittajohn · 2026-06-12T10:03:34Z

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-ovn-dualstack-techpreview openshift/kubernetes#2653
/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-upgrade-ovn-ipv6 openshift/kubernetes#2653

openshift-ci · 2026-06-12T10:03:38Z

@jubittajohn: given command is invalid: at least one of the commands given is only supported on a one-command-per-comment basis, please separate out commands as multiple comments

jubittajohn · 2026-06-12T10:03:59Z

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-ovn-dualstack-techpreview openshift/kubernetes#2653

openshift-ci · 2026-06-12T10:04:06Z

@jubittajohn: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-ovn-dualstack-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/08c491c0-6646-11f1-81d7-25c65b7ec43f-0

jubittajohn · 2026-06-12T10:04:11Z

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-upgrade-ovn-ipv6 openshift/kubernetes#2653

openshift-ci · 2026-06-12T10:04:17Z

@jubittajohn: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-upgrade-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/0fec8a20-6646-11f1-80d7-36b35e401869-0

jubittajohn · 2026-06-12T14:18:10Z

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-upgrade-ovn-ipv6 openshift/kubernetes#2653

jubittajohn · 2026-06-12T14:18:30Z

/payload-job-with-prs periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-ovn-dualstack-techpreview openshift/kubernetes#2653

openshift-ci · 2026-06-12T14:18:37Z

@jubittajohn: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-ovn-dualstack-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/974a1550-6669-11f1-8f9d-c802d7388f73-0

openshift-ci · 2026-06-12T14:18:47Z

@jubittajohn: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-upgrade-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/8aa3b5e0-6669-11f1-84b4-2e6817d0bb0b-0

bertinatto · 2026-06-12T20:34:33Z

/lgtm

openshift-ci · 2026-06-12T20:34:58Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bertinatto, jacobsee

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:

~~OWNERS~~ [bertinatto]
~~test/extended/util/image/OWNERS~~ [bertinatto]

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

jubittajohn · 2026-06-12T20:38:26Z

/verified by below

The e2e-metal-ipi-ovn-ipv6 presubmit job is green
Failed run link for the job for the test [sig-network-edge] DNS should answer A and AAAA queries for a dual-stack service due to missing image.
- same payload job run on the fix pr; link
- from build log of the job:
```
 passed: (32.4s) 2026-06-12T17:49:55 "[sig-network-edge] DNS should answer A and AAAA queries for a dual-stack service [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]"
```
Failed run link for the job for the test [sig-arch][Feature:ClusterUpgrade] Cluster should remain functional during upgrade [Disruptive] [Serial] due to missing image.
- same payload job run on the fix pr; link
- from build log of the job:
```
 passed: (1h2m44s) 2026-06-12T17:54:13 "[sig-arch][Feature:ClusterUpgrade] Cluster should remain functional during upgrade [Disruptive] [Serial]"
```
[sig-ci] [Early] prow job name should match os version test failure in the job is a known failure related to rhcos 10 changes for which the fixed is now merged but hasn't been included in nightly yet.
https://redhat-internal.slack.com/archives/C01CQA76KMX/p1781257728936819?thread_ts=1781257232.890049&cid=C01CQA76KMX

openshift-ci-robot · 2026-06-12T20:38:30Z

@jubittajohn: The /verified command must be used with one of the following actions: by, later, remove, or bypass. See https://docs.ci.openshift.org/docs/architecture/jira/#premerge-verification for more information.

Details

In response to this:

/verified
The e2e-metal-ipi-ovn-ipv6 presubmit job is green
Failed run link for the job for the test [sig-network-edge] DNS should answer A and AAAA queries for a dual-stack service due to missing image.
same payload job run on the fix pr; link
from build log of the job:
 passed: (32.4s) 2026-06-12T17:49:55 "[sig-network-edge] DNS should answer A and AAAA queries for a dual-stack service [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel]"
Failed run link for the job for the test [sig-arch][Feature:ClusterUpgrade] Cluster should remain functional during upgrade [Disruptive] [Serial] due to missing image.
same payload job run on the fix pr; link
from build log of the job:
 passed: (1h2m44s) 2026-06-12T17:54:13 "[sig-arch][Feature:ClusterUpgrade] Cluster should remain functional during upgrade [Disruptive] [Serial]"
[sig-ci] [Early] prow job name should match os version test failure in the job is a known failure related to rhcos 10 changes for which the fixed is now merged but hasn't been included in nightly yet.
https://redhat-internal.slack.com/archives/C01CQA76KMX/p1781257728936819?thread_ts=1781257232.890049&cid=C01CQA76KMX

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.

jubittajohn · 2026-06-12T20:39:33Z

/verified by #31281 (comment)

openshift-ci-robot · 2026-06-12T20:39:46Z

@jubittajohn: This PR has been marked as verified by https://github.com/openshift/origin/pull/31281#issuecomment-4695218906.

Details

In response to this:

/verified by #31281 (comment)

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.

jubittajohn · 2026-06-12T20:41:34Z

/retitle OCPSTRAT-3036: Open Deduplicate and use the jessie image

openshift-ci-robot · 2026-06-12T20:41:42Z

@jacobsee: This pull request references OCPSTRAT-3036 which is a valid jira issue.

Details

In response to this:

Summary by CodeRabbit

Bug Fixes

Prevented duplicate image mirror entries by deduplicating injected mappings against existing generated mappings.

Injection now skips adding mappings when equivalent destination references are already present.

Mirrored-mode output formatting for source/destination mappings was adjusted for consistency.

Updated the default test image reference used in generated mappings to a newer compatible image.

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.

jacobsee force-pushed the fix-jessie-updated branch from cb9e906 to bfde97d Compare June 10, 2026 20:23

openshift-ci Bot requested review from deads2k and sjenning June 10, 2026 20:24

coderabbitai Bot approved these changes Jun 10, 2026

View reviewed changes

openshift-ci Bot added the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label Jun 10, 2026

jacobsee force-pushed the fix-jessie-updated branch 2 times, most recently from a5d5a70 to 38b9897 Compare June 10, 2026 20:57

openshift-ci Bot added the e2e-images-update Related to images used by e2e tests label Jun 10, 2026

openshift-ci Bot mentioned this pull request Jun 11, 2026

WIP: OCPSTRAT-3036: Rebase 1.36.1 openshift/kubernetes#2653

Open

inject jessie-dnsutils and nginx images at correct indices (with dedu…

585be7c

…plication)

openshift-ci Bot assigned bertinatto Jun 12, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 12, 2026

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 12, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 12, 2026

openshift-ci Bot changed the title ~~Deduplicate and use the jessie image~~ OCPSTRAT-3036: Open Deduplicate and use the jessie image Jun 12, 2026

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 12, 2026

openshift-merge-bot Bot merged commit f0a8565 into openshift:main Jun 12, 2026
22 checks passed

Conversation

jacobsee commented Jun 10, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

openshift-merge-bot Bot commented Jun 10, 2026

Uh oh!

coderabbitai Bot commented Jun 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested labels

Suggested reviewers

❌ Failed checks (1 warning)

Uh oh!

jacobsee commented Jun 10, 2026

Uh oh!

openshift-merge-bot Bot commented Jun 10, 2026

Uh oh!

jubittajohn commented Jun 10, 2026

Uh oh!

jacobsee commented Jun 10, 2026

Uh oh!

jacobsee commented Jun 11, 2026

Uh oh!

jacobsee commented Jun 11, 2026

Uh oh!

jacobsee commented Jun 11, 2026

Uh oh!

openshift-trt Bot commented Jun 11, 2026

Uh oh!

jubittajohn commented Jun 11, 2026

Uh oh!

jubittajohn commented Jun 11, 2026

Uh oh!

jubittajohn commented Jun 11, 2026

Uh oh!

openshift-ci Bot commented Jun 11, 2026

Uh oh!

jubittajohn commented Jun 11, 2026

Uh oh!

openshift-ci Bot commented Jun 11, 2026

Uh oh!

jubittajohn commented Jun 11, 2026

Uh oh!

openshift-ci Bot commented Jun 11, 2026

Uh oh!

jubittajohn commented Jun 11, 2026

Uh oh!

openshift-ci Bot commented Jun 11, 2026

Uh oh!

jubittajohn commented Jun 12, 2026

Uh oh!

openshift-ci Bot commented Jun 12, 2026

Uh oh!

openshift-ci Bot commented Jun 12, 2026

Uh oh!

jubittajohn commented Jun 12, 2026

Uh oh!

openshift-ci Bot commented Jun 12, 2026

Uh oh!

jubittajohn commented Jun 12, 2026

Uh oh!

openshift-ci Bot commented Jun 12, 2026

Uh oh!

jubittajohn commented Jun 12, 2026

Uh oh!

openshift-ci Bot commented Jun 12, 2026

Uh oh!

jubittajohn commented Jun 12, 2026

Uh oh!

openshift-ci Bot commented Jun 12, 2026

Uh oh!

jubittajohn commented Jun 12, 2026

Uh oh!

jubittajohn commented Jun 12, 2026

Uh oh!

openshift-ci Bot commented Jun 12, 2026

jacobsee commented Jun 10, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented Jun 10, 2026 •

edited

Loading

jubittajohn commented Jun 12, 2026 •

edited

Loading

jubittajohn commented Jun 12, 2026 •

edited by openshift-ci Bot

Loading

openshift-ci-robot commented Jun 12, 2026 •

edited by openshift-ci Bot

Loading