Skip to content

Revert image flattening and clean node images before disconnected tests#83

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift-cnv:mainfrom
rlobillo:revert-flatten
Jun 9, 2026
Merged

Revert image flattening and clean node images before disconnected tests#83
openshift-merge-bot[bot] merged 2 commits into
openshift-cnv:mainfrom
rlobillo:revert-flatten

Conversation

@rlobillo

@rlobillo rlobillo commented Jun 3, 2026

Copy link
Copy Markdown
Member

Summary

  • Revert the multi-arch image flattening when mirroring to the internal registry: always use --keep-manifest-list=true instead of --filter-by-os=linux/amd64 for internal registry mirrors.
  • Clean images stored in nodes (crictl rmi --prune) before running disconnected tests to avoid stale cached images from previous runs.

More details

The --filter-by-os flag (when using internal registry) was flattening multi-arch manifests into single-arch images when mirroring to the internal registry. This caused issues because the manifest list are needed for running tier2 testsuite. Reverting to --keep-manifest-list=true preserves the original manifest structure for all mirror targets.

Additionally, a cleanup step is added at the beginning of the disconnected CI script to prune container images cached on each node, preventing leftover images from prior runs from interfering with the test.

What this PR does / why we need it

  1. Reverts commit a43f8b2: removes the conditional --filter-by-os=linux/amd64 flag for internal registry mirrors and restores --keep-manifest-list=true for all mirror operations.
  2. Adds node image cleanup: runs crictl rmi --prune on all nodes before mirroring, ensuring a clean state for disconnected validation tests.

🤖 Generated with Claude Code

@openshift-ci openshift-ci Bot requested review from nunnatsa and orenc1 June 3, 2026 07:14
@openshift-ci openshift-ci Bot added the approved label Jun 3, 2026
@rlobillo

rlobillo commented Jun 3, 2026

Copy link
Copy Markdown
Member Author

/retest ci/prow/images

@rlobillo

rlobillo commented Jun 3, 2026

Copy link
Copy Markdown
Member Author

/retest pull-ci-openshift-cnv-ocp-virt-validation-checkup-main-images

@rlobillo

rlobillo commented Jun 3, 2026

Copy link
Copy Markdown
Member Author

/test images

1 similar comment
@rlobillo

rlobillo commented Jun 3, 2026

Copy link
Copy Markdown
Member Author

/test images

@rlobillo

rlobillo commented Jun 9, 2026

Copy link
Copy Markdown
Member Author

@orenc1 This PR has been successfully tested on openshift/release#79293 (comment) (It has been applied from a gist patch before running the self-validation tool).

It's confirmed then that it is working as expected to fully covered the disconnected scenario on the periodic prow job.

Please review, thank you!

@orenc1 orenc1 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Looks good to me label Jun 9, 2026
@openshift-ci

openshift-ci Bot commented Jun 9, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: orenc1, rlobillo

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:

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

@openshift-merge-bot openshift-merge-bot Bot merged commit 2fae3bc into openshift-cnv:main Jun 9, 2026
5 checks passed
@openshift-ci

openshift-ci Bot commented Jun 9, 2026

Copy link
Copy Markdown

@rlobillo: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/images a678ed1 link unknown /test images

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.

@rlobillo

rlobillo commented Jun 9, 2026

Copy link
Copy Markdown
Member Author

/cherry-pick release-4.22

@openshift-cherrypick-robot

Copy link
Copy Markdown
Collaborator

@rlobillo: new pull request created: #85

Details

In response to this:

/cherry-pick release-4.22

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.

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

Labels

approved lgtm Looks good to me

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants