feat: hybrid RPM presubmit CI for MicroShift#81195
Conversation
|
Skipping CI for Draft Pull Request. |
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
|
Note Reviews pausedIt 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 Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
WalkthroughMicroShift CI now adds RPM presubmit E2E jobs, maps ChangesMicroShift RPM presubmit CI wiring
Estimated code review effort🎯 2 (Simple) | ⏱️ ~8 minutes Suggested labels
🚥 Pre-merge checks | ✅ 13 | ❌ 2❌ Failed checks (2 warnings)
✅ Passed checks (13 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
openshift-ci
Bot
added
the
approved
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@ci-operator/config/openshift/microshift/openshift-microshift-main.yaml`:
- Around line 177-184: The e2e-aws-tests-rpm-el10 job is still pointing at the
EL9 image path because MICROSHIFT_OS is set incorrectly. Update the env in the
e2e-aws-tests-rpm-el10 job definition to use the EL10 OS value so it matches the
SCENARIO_TYPE rpm-presubmits-el10 and the job name.
In
`@ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh`:
- Around line 30-31: The SCENARIO_TYPE check in the ISO build script is too
broad and is matching non-RPM presubmit jobs like existing presubmits and
bootc-presubmits*; tighten the branch condition in
openshift-microshift-infra-iso-build-commands.sh so only rpm-presubmits-* enters
the -rpm_only path. Update the conditional around the SCENARIO_TYPE match to use
a more specific pattern and leave the normal ISO/image build flow untouched for
all other presubmit scenarios.
🪄 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 YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 2bcd2ca3-a23d-4948-8f9b-ed2321ff9c67
📒 Files selected for processing (3)
ci-operator/config/openshift/microshift/openshift-microshift-main.yamlci-operator/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.shci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: agullon The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/pj-rehearse e2e-aws-tests-rpm-el9 |
|
/pj-rehearse e2e-aws-tests-rpm-el10 |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh`:
- Around line 45-48: The ISO build step is hardcoded to clone agullon/microshift
at shiftweek/rpm-presubmit-ci instead of using the standard checkout flow.
Remove the temporary GUSR/GBRN override and the direct git clone in
openshift-microshift-infra-iso-build-commands.sh, and restore the normal
ci_clone_src-based source checkout so the step validates the canonical
repository state.
🪄 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 YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: fdec9d69-7203-4eb0-9af8-ae1f630901c9
⛔ Files ignored due to path filters (1)
ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yamlis excluded by!ci-operator/jobs/**
📒 Files selected for processing (1)
ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh
| # TODO: Revert to 'ci_clone_src' before merging | ||
| GUSR=agullon | ||
| GBRN=shiftweek/rpm-presubmit-ci | ||
| git clone "https://github.com/${GUSR}/microshift.git" -b "${GBRN}" /go/src/github.com/openshift/microshift |
There was a problem hiding this comment.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
Remove the hardcoded fork/branch before merge.
Lines 46-48 force this step to test agullon/microshift@shiftweek/rpm-presubmit-ci instead of the canonical checkout, so merged presubmits will validate the wrong source and can start failing once that branch disappears. Please restore the normal ci_clone_src flow here before this lands.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In
`@ci-operator/step-registry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh`
around lines 45 - 48, The ISO build step is hardcoded to clone
agullon/microshift at shiftweek/rpm-presubmit-ci instead of using the standard
checkout flow. Remove the temporary GUSR/GBRN override and the direct git clone
in openshift-microshift-infra-iso-build-commands.sh, and restore the normal
ci_clone_src-based source checkout so the step validates the canonical
repository state.
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el9 |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
@agullon: your |
1 similar comment
|
@agullon: your |
|
@agullon: job(s): e2e-aws-tests-rpm-el9 either don't exist or were not found to be affected, and cannot be rehearsed |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el10 |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el9 |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el9 |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el10 |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
1 similar comment
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el9 |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el10 |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
1 similar comment
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el10 |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el9 |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el10 |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-lifecycle-x86 |
|
@agullon: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
Build infrastructure: - Add -rpm_only flag to ci_phase_iso_build.sh that skips composer config and image builds, only building RPMs (~13 min vs ~30 min) - Add download_isos action to manage_build_cache.sh to fetch cached installer ISOs needed for VM kickstart in RPM-only mode - Skip mirror registry setup for RPM scenarios in ci_phase_boot_and_test.sh (RPM installs pull from CDN, not mirror) - Add scenarios-rpm to get_scenario_type_from_path() in common.sh Scenario framework (scenario_rpm.sh): - rpm_configure_vm: firewall, RHSM registration, repo configuration - rpm_install_microshift: dnf install, NM connectivity check, service start, endpoint readiness wait - rpm_reboot_and_wait: clean reboot for scenarios needing it (dual-stack, ipv6, multi-nic, low-latency) - configure_rpm_repos/configure_cdn_repo: RHEL version-aware repo setup derived from SCENARIO_TYPE at runtime Companion to openshift/release#81195. pre-commit.check-secrets: ENABLED
|
/retest |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-lifecycle-amr |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
@agullon: job(s): pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-lifecycle-amr either don't exist or were not found to be affected, and cannot be rehearsed |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-lifecycle-arm |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-functional-arm |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-functional-x86 |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-functional-arm |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-lifecycle-arm |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-functional-x86 |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-lifecycle-arm |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-periodic-el9-functional-x86 |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-ostree-periodic-el9-lifecycle-x86 |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el10-lifecycle-x86 |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-el9-lifecycle-x86 |
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
1 similar comment
|
@agullon: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
1 participant
Summary
Replace 6 bootc/ostree presubmit CI jobs with 2 lightweight RPM-only presubmit jobs on ARM, reducing presubmit cost by ~86% and feedback time by ~39%.
What changed
Presubmits (main.yaml):
e2e-aws-tests,e2e-aws-tests-arm,e2e-aws-tests-bootc-{el9,el10},e2e-aws-tests-bootc-arm-{el9,el10}(6 jobs on c5.metal/m7g.metal)e2e-aws-tests-rpm-presubmit-{el9,el10}-arm(2 jobs on c7g.metal) — build only RPMs, skip image builds entirelyPeriodics (main.yaml + release-5.0__periodics.yaml):
Step registry:
iso-build: dispatchci_phase_iso_build.sh -rpm_onlyforrpm-presubmits-*scenario types, writeSCENARIO_TYPEto_output/scenario_typefor EC2 instancesincludes: routerpm-presubmits-{el9,el10}toscenarios-rpm/presubmits/, renamescenarios/→scenarios-ostree/, add lifecycle/functional periodic mappingsNaming convention:
e2e-aws-tests-{type}-{trigger}-{el}-{category}-{arch}Cost impact
Commits
make jobsoutputRelated
Test plan
make jobse2e-aws-tests-rpm-presubmit-el9-armpasses end-to-end