USHIFT-7245: Revert crio SELinux workaround by ggiguash · Pull Request #6969 · openshift/microshift

ggiguash · 2026-07-01T16:01:06Z

Also fixes USHIFT-7294 in cc05663
Also addresses USHIFT-7322 in a4722e2 and ab92c9c commits

Summary by CodeRabbit

Bug Fixes
- Updated SELinux policy requirements for expected runtime contexts.
Chores
- Switched BootC and base imagery to production registries.
- Updated RPM repository setup to use EUS and removed staging-specific mirror configuration.
- Refreshed BootC image blueprints to use direct RHEL 10.2 references.
- Dropped microshift metrics server RPMs from the optional list.
- Simplified RHEL 10.2 repository entries in the mirror repo test config.
Tests
- Improved BootC image build tooling to pick the correct Image Builder for RHEL 9 vs RHEL 10.
- Parallelized ISO build cache generation for el9 and el10.

…ession" This reverts commit 1b65a77.

openshift-ci-robot · 2026-07-01T16:01:11Z

@ggiguash: This pull request references USHIFT-7245 which is a valid jira issue.

Details

In response to this:

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.

ggiguash · 2026-07-01T16:01:16Z

/test ?

openshift-ci · 2026-07-01T16:01:20Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

ggiguash · 2026-07-01T16:02:42Z

/test e2e-aws-tests-bootc-periodic-el10
/test e2e-aws-tests-bootc-periodic-arm-el10

coderabbitai · 2026-07-01T16:04:59Z

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

@coderabbitai resume to resume automatic reviews.
@coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

▶️ Resume reviews
🔍 Trigger review

Walkthrough

This PR updates SELinux policy inputs, bootc test image sources, bootc image-builder selection, and cache build orchestration.

Changes

Bootc and test infrastructure updates

Layer / File(s)	Summary
Policy and RPM inputs `packaging/selinux/microshift.te`, `test/bin/common.sh`	`kernel_t` is removed from the SELinux `gen_require` block, and the optional RPM list drops the metrics server packages.
Bootc image inputs `test/image-blueprints-bootc/el10/layer1-base/group1/rhel102-test-agent.containerfile`, `test/image-blueprints-bootc/el10/layer1-base/group2/rhel102-bootc.image-bootc`, `test/image-blueprints-bootc/el10/layer1-base/group2/rhel102-installer.image-installer`, `test/package-sources-bootc/rhel102-mirror.repo`	The bootc test container and blueprint inputs switch to updated RHEL 10.2 sources and remove the staging mirror repo blocks.
Bootc image-builder selection `test/bin/pyutils/build_bootc_images.py`	The bootc image builder script now selects an image-builder by bootc image reference, updates cleanup, and uses that selection for pull and run.
Cache build parallelism `test/bin/ci_phase_iso_build.sh`	The cache update step runs the el9 and el10 bootc base-layer builds in parallel and waits for both jobs.

Estimated code review effort: 3 (Moderate) | ~25 minutes

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 passed)

Check name	Status	Explanation
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	No changed Go/Ginkgo test files were present in the commit diff; the PR only touches scripts, blueprints, policy, and containerfiles.
Test Structure And Quality	✅ Passed	No Ginkgo test code was changed; the PR touches scripts, blueprints, SELinux policy, and image metadata only.
Microshift Test Compatibility	✅ Passed	No new Ginkgo e2e tests or MicroShift-unsafe APIs/resources were added; the changed files are build scripts and blueprints only.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	PASS: The PR only changes scripts, SELinux policy, and bootc image blueprints; no Ginkgo e2e tests or SNO-sensitive test logic were added.
Topology-Aware Scheduling Compatibility	✅ Passed	No deployment manifests, operator code, or controllers were changed; the PR only touches build/test scripts, SELinux, and image sources, so topology scheduling isn’t implicated.
Ote Binary Stdout Contract	✅ Passed	The changed Python entrypoint logs via stderr, and the patch adds no new process-level stdout writes.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	No new Ginkgo e2e tests were added; the changed files are build/config scripts and blueprints, so this IPv6/disconnected-network check is not applicable.
No-Weak-Crypto	✅ Passed	No MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or secret/token comparisons were added; only image-ref string checks and build-script changes.
Container-Privileges	✅ Passed	No modified container/K8s manifest adds privileged, hostNetwork, hostPID/IPC, SYS_ADMIN, or allowPrivilegeEscalation; touched files only change image refs and repo setup.
No-Sensitive-Data-In-Logs	✅ Passed	Changed hunks only adjust bootc image-builder selection and parallel cache builds; no new logging or secret/PII-bearing output was added.
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title matches a real change in the PR and is reasonably aligned with the SELinux policy adjustment.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

ggiguash · 2026-07-02T08:26:19Z

/test ?

ggiguash · 2026-07-02T08:26:46Z