Skip to content

USHIFT-6741: Fix bootc release periodic jobs for 4.22 #76664

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

Merged
openshift-merge-bot merged 1 commit into from
Mar 23, 2026
+194 −8
Merged

USHIFT-6741: Fix bootc release periodic jobs for 4.22 #76664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 24 additions & 4 deletions ci-operator/config/openshift/microshift/openshift-microshift-release-4.22__periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,24 +186,44 @@ tests:
SCENARIO_TYPE: releases
TEST_EXECUTION_TIMEOUT: 60m
workflow: openshift-microshift-e2e-metal-tests
- as: e2e-aws-tests-bootc-release-periodic
- as: e2e-aws-tests-bootc-release-periodic-el9
cron: 0 3 * * 0,2,4
steps:
cluster_profile: openshift-org-aws
env:
EC2_INSTANCE_TYPE: c5.metal
MICROSHIFT_OS: rhel-9.6
SCENARIO_TYPE: bootc-releases
SCENARIO_TYPE: bootc-releases-el9
TEST_EXECUTION_TIMEOUT: 60m
workflow: openshift-microshift-e2e-metal-tests
- as: e2e-aws-tests-bootc-release-arm-periodic
- as: e2e-aws-tests-bootc-release-periodic-el10
cron: 0 3 * * 0,2,4
steps:
cluster_profile: openshift-org-aws
env:
EC2_INSTANCE_TYPE: c5.metal
MICROSHIFT_OS: rhel-9.6
Copy link
Contributor

@agullon agullon Mar 23, 2026

Choose a reason for hiding this comment

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

why rhel-9.6 here? tbh, I'm not sure if this env var is used

Copy link
Contributor Author

@vanhalenar vanhalenar Mar 23, 2026

Choose a reason for hiding this comment

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

It was rhel-9.6 before, I left it like it is, it's 9.6 in all the other jobs as well. If I remember correctly that's the host OS

Copy link
Contributor

@agullon agullon Mar 23, 2026

Choose a reason for hiding this comment

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

you are right, this is only for the EC2 machine, so rhel-9.6 is correct here, thanks. We can merge the PR.

SCENARIO_TYPE: bootc-releases-el10
TEST_EXECUTION_TIMEOUT: 60m
workflow: openshift-microshift-e2e-metal-tests
- as: e2e-aws-tests-bootc-release-arm-periodic-el9
cron: 0 3 * * 0,2,4
steps:
cluster_profile: openshift-org-aws
env:
EC2_INSTANCE_TYPE: c7g.metal
MICROSHIFT_OS: rhel-9.6
Copy link
Contributor

@agullon agullon Mar 23, 2026

Choose a reason for hiding this comment

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

why rhel-9.6 here? tbh, I'm not sure if this env var is used

Copy link
Contributor

@agullon agullon Mar 23, 2026

Choose a reason for hiding this comment

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

this is only for the EC2 machine, so rhel-9.6 is correct here, thanks. We can merge the PR.

SCENARIO_TYPE: bootc-releases-el9
TEST_EXECUTION_TIMEOUT: 60m
workflow: openshift-microshift-e2e-metal-tests
- as: e2e-aws-tests-bootc-release-arm-periodic-el10
cron: 0 3 * * 0,2,4
steps:
cluster_profile: openshift-org-aws
env:
EC2_INSTANCE_TYPE: c7g.metal
MICROSHIFT_OS: rhel-9.6
SCENARIO_TYPE: bootc-releases
SCENARIO_TYPE: bootc-releases-el10
TEST_EXECUTION_TIMEOUT: 60m
workflow: openshift-microshift-e2e-metal-tests
zz_generated_metadata:
Expand Down
174 changes: 170 additions & 4 deletions ci-operator/jobs/openshift/microshift/openshift-microshift-release-4.22-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ periodics:
ci.openshift.io/generator: prowgen
job-release: "4.22"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-microshift-release-4.22-periodics-e2e-aws-tests-bootc-release-arm-periodic
name: periodic-ci-openshift-microshift-release-4.22-periodics-e2e-aws-tests-bootc-release-arm-periodic-el10
spec:
containers:
- args:
Expand All @@ -919,7 +919,7 @@ periodics:
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-aws-tests-bootc-release-arm-periodic
- --target=e2e-aws-tests-bootc-release-arm-periodic-el10
- --variant=periodics
command:
- ci-operator
Expand Down Expand Up @@ -993,7 +993,7 @@ periodics:
ci.openshift.io/generator: prowgen
job-release: "4.22"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-microshift-release-4.22-periodics-e2e-aws-tests-bootc-release-periodic
name: periodic-ci-openshift-microshift-release-4.22-periodics-e2e-aws-tests-bootc-release-arm-periodic-el9
spec:
containers:
- args:
Expand All @@ -1002,7 +1002,173 @@ periodics:
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-aws-tests-bootc-release-periodic
- --target=e2e-aws-tests-bootc-release-arm-periodic-el9
- --variant=periodics
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
- agent: kubernetes
cluster: build01
cron: 0 3 * * 0,2,4
decorate: true
decoration_config:
skip_cloning: true
extra_refs:
- base_ref: release-4.22
org: openshift
repo: microshift
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
ci-operator.openshift.io/variant: periodics
ci.openshift.io/generator: prowgen
job-release: "4.22"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-microshift-release-4.22-periodics-e2e-aws-tests-bootc-release-periodic-el10
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-bootc-release-periodic-el10
- --variant=periodics
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
- agent: kubernetes
cluster: build01
cron: 0 3 * * 0,2,4
decorate: true
decoration_config:
skip_cloning: true
extra_refs:
- base_ref: release-4.22
org: openshift
repo: microshift
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws
ci-operator.openshift.io/variant: periodics
ci.openshift.io/generator: prowgen
job-release: "4.22"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-microshift-release-4.22-periodics-e2e-aws-tests-bootc-release-periodic-el9
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-bootc-release-periodic-el9
- --variant=periodics
command:
- ci-operator
Expand Down