feat: add RPM-only presubmit Prow jobs for MicroShift#81195
Conversation
Add e2e-aws-tests-rpm-el9 and e2e-aws-tests-rpm-el10 presubmit jobs that skip image builds and only build RPMs, reducing CI time ~35-40%. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED
|
Skipping CI for Draft Pull Request. |
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (1)
✅ Files skipped from review due to trivial changes (1)
WalkthroughTwo new MicroShift RPM presubmit jobs are added for EL9 and EL10. The scenario lookup table and ISO build step were updated to recognize RPM presubmit scenarios and select the RPM-only build path. ChangesMicroShift RPM presubmit CI wiring
Estimated code review effort🎯 2 (Simple) | ⏱️ ~8 minutes Suggested labels
🚥 Pre-merge checks | ✅ 14 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (14 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
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED
|
[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 |
Avoid matching regular presubmit jobs that also contain "presubmit". Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED
|
/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. |
The infra-iso-build step references SCENARIO_TYPE but it was not declared in the ref YAML, causing 'unbound variable' with set -u. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED
|
/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. |
|
@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. |
The directories on the microshift branch are presubmits/, not presubmits-rpm/. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED
|
/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. |
|
[REHEARSALNOTIFIER]
A total of 371 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs. A full list of affected jobs can be found here Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
/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-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. |
|
@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. |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el9 |
|
/pj-rehearse pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el10 |
1 participant
Summary
e2e-aws-tests-rpm-el9ande2e-aws-tests-rpm-el10presubmit jobsrpm-presubmits-*scenario types toscenarios-rpm/directoriesci_phase_iso_build.sh -rpm_onlyfor RPM presubmit jobs to skip image buildsContext
Companion PR to openshift/microshift#6961. Shift Week project to reduce presubmit CI time ~35-40% by running RPM-based scenarios without building ostree/bootc images.
Test plan
make jobsvalidatione2e-aws-tests-rpm-el9presubmit job end-to-end🤖 Generated with Claude Code
Summary by CodeRabbit
This PR updates MicroShift’s OpenShift CI/Prow configuration to add and optimize RPM presubmit workflows.
e2e-aws-tests-rpm-el9ande2e-aws-tests-rpm-el10, which runopenshift-microshift-e2e-metal-testson theopenshift-org-awscluster profile (same AWS instance type/OS as nearby E2E presubmits) and use scenario typesrpm-presubmits-el9/rpm-presubmits-el10with existingrun_if_changedgating patterns.get_source_dir()lookup to recognizerpm-presubmits-el9andrpm-presubmits-el10, mapping them to the correspondingscenarios-rpm/<el>/presubmits-rpm:scenarios-rpmdirectories.SCENARIO_TYPEinto the iso-build step and runsci_phase_iso_build.sh -rpm_onlywheneverSCENARIO_TYPEmatches^rpm-presubmits-.*$(while cache jobs still use-update_cache, and other scenarios keep default behavior).SCENARIO_TYPEis declared in the iso-build step reference YAML (avoiding an unbound-variable failure underset -u).Overall, this is intended to cut presubmit CI time by roughly 35–40% by running RPM-based scenarios without building ostree/bootc images.