Skip to content

feat: add RPM-only presubmit Prow jobs for MicroShift #81195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
agullon wants to merge 8 commits into
base: main
Choose a base branch
from
+199 −1
Draft

feat: add RPM-only presubmit Prow jobs for MicroShift #81195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
482758b
feat: add RPM-only presubmit Prow jobs for MicroShift
agullon Jun 29, 2026
afa59eb
chore: regenerate Prow job definitions after make jobs
agullon Jun 29, 2026
f917f02
fix: narrow rpm_only match to rpm-presubmits-* scenario types
agullon Jun 29, 2026
736ed7a
fix: declare SCENARIO_TYPE env var in iso-build step ref
agullon Jun 29, 2026
92ab6f8
fix: correct scenario directory paths for rpm-presubmits
agullon Jun 29, 2026
8f69bfe
feat: merge rpm presubmit jobs and add ARM variant
agullon Jun 30, 2026
b7076ea
fix: update SCENARIO_TYPE regex to match rpm-presubmits
agullon Jun 30, 2026
d3792f8
feat: split RPM presubmit jobs by RHEL version (el9/el10)
agullon Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ci-operator/config/openshift/microshift/openshift-microshift-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,24 @@ tests:
MICROSHIFT_OS: rhel-9.8
SCENARIO_TYPE: presubmits
workflow: openshift-microshift-e2e-metal-tests
- as: e2e-aws-tests-rpm-el9
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$
steps:
cluster_profile: openshift-org-aws
env:
EC2_INSTANCE_TYPE: c5.metal
MICROSHIFT_OS: rhel-9.8
SCENARIO_TYPE: rpm-presubmits-el9
workflow: openshift-microshift-e2e-metal-tests
- as: e2e-aws-tests-rpm-el10
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$
steps:
cluster_profile: openshift-org-aws
env:
EC2_INSTANCE_TYPE: c5.metal
MICROSHIFT_OS: rhel-9.8
SCENARIO_TYPE: rpm-presubmits-el10
workflow: openshift-microshift-e2e-metal-tests
- as: e2e-aws-tests-cache
capabilities:
- intranet
Expand Down
168 changes: 168 additions & 0 deletions ci-operator/jobs/openshift/microshift/openshift-microshift-main-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2186,6 +2186,174 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-tests-release-arm,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^main$
- ^main-
cluster: build03
context: ci/prow/e2e-aws-tests-rpm-el9
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
ci.openshift.io/generator: prowgen
job-release: "5.0"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el9
rerun_command: /test e2e-aws-tests-rpm-el9
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-aws-tests-rpm-el9
command:
- ci-operator
env:
- name: HTTP_SERVER_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
imagePullPolicy: Always
name: ""
ports:
- containerPort: 8080
name: http
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: boskos
secret:
items:
- key: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-el9,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^main$
- ^main-
cluster: build03
context: ci/prow/e2e-aws-tests-rpm-el10
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
ci.openshift.io/generator: prowgen
job-release: "5.0"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-microshift-main-e2e-aws-tests-rpm-el10
rerun_command: /test e2e-aws-tests-rpm-el10
run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|test/.*|vendor/.*|Makefile.*|scripts/.*)$
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-aws-tests-rpm-el10
command:
- ci-operator
env:
- name: HTTP_SERVER_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
imagePullPolicy: Always
name: ""
ports:
- containerPort: 8080
name: http
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: boskos
secret:
items:
- key: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-tests-rpm-el10,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down
2 changes: 2 additions & 0 deletions ...tor/step-registry/openshift/microshift/includes/openshift-microshift-includes-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,8 @@ function get_source_dir() {
[bootc-c2cc]="scenarios-bootc/c2cc:scenarios-bootc"
[releases]="scenarios/releases:scenarios"
[presubmits]="scenarios/presubmits:scenarios"
[rpm-presubmits-el9]="scenarios-rpm/presubmits:scenarios-rpm"
[rpm-presubmits-el10]="scenarios-rpm/presubmits:scenarios-rpm"
[periodics]="scenarios/periodics:scenarios-periodics"
)
local -r scenario_type=$1
Expand Down
10 changes: 9 additions & 1 deletion ...try/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ export CI_JOB_NAME="${JOB_NAME}"
export GITHUB_TOKEN="\$(cat /tmp/token-git 2>/dev/null || echo '')"
if [[ "${JOB_NAME}" =~ .*-cache.* ]] ; then
./test/bin/ci_phase_iso_build.sh -update_cache
elif [[ "${SCENARIO_TYPE}" =~ ^rpm-presubmits.*$ ]] ; then
./test/bin/ci_phase_iso_build.sh -rpm_only
else
./test/bin/ci_phase_iso_build.sh
fi
Expand All @@ -40,7 +42,10 @@ chmod +x /tmp/iso.sh
# GBRN=mybranch
# git clone "https://github.com/${GUSR}/microshift.git" -b "${GBRN}" /go/src/github.com/openshift/microshift
#
ci_clone_src
# 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
Comment on lines +45 to +48

@coderabbitai coderabbitai Bot Jun 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🎯 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.


download_brew_rpms() {
# See BREW_RPM_SOURCE variable definition in test/bin/common.sh
Expand Down Expand Up @@ -89,6 +94,9 @@ if [[ "${JOB_NAME}" =~ .*-cache.* ]] ; then
download_brew_rpms
fi

# Write SCENARIO_TYPE for the test step to read on the EC2 instance
echo "${SCENARIO_TYPE}" > /go/src/github.com/openshift/microshift/_output/scenario_type

# Archive the sources, potentially including MicroShift RPMs from brew
tar czf /tmp/microshift.tgz /go/src/github.com/openshift/microshift

Expand Down
2 changes: 2 additions & 0 deletions ...gistry/openshift/microshift/infra/iso-build/openshift-microshift-infra-iso-build-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ ref:
env:
- name: HOME
default: /tmp/secret
- name: SCENARIO_TYPE
default: ""
credentials:
- name: microshift-rhsm-creds
namespace: test-credentials
Expand Down