From 03e5f86567dd2fe65043a4c407fe8f58be2652e8 Mon Sep 17 00:00:00 2001 From: Jianlin Liu Date: Tue, 10 Feb 2026 16:30:26 +0800 Subject: [PATCH 1/2] enable rhcos10 image stream --- ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh | 7 +++++++ ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh b/ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh index c3dcdf5f4b4f8..e6c83c150b3f3 100755 --- a/ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh +++ b/ci-operator/step-registry/ipi/conf/ipi-conf-commands.sh @@ -35,6 +35,13 @@ fips: true EOF fi +if [[ -n "${OS_IMAGE_STREAM}" ]]; then + echo "Adding 'osImageStream: ${OS_IMAGE_STREAM}' to install-config.yaml" + cat >> "${out}" << EOF +osImageStream: ${OS_IMAGE_STREAM} +EOF +fi + if [ -n "${BASELINE_CAPABILITY_SET}" ]; then echo "Adding 'capabilities: ...' to install-config.yaml" cat >> "${out}" << EOF diff --git a/ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml b/ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml index 7456aba1619e9..eb96b5b107bb8 100644 --- a/ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml +++ b/ci-operator/step-registry/ipi/conf/ipi-conf-ref.yaml @@ -16,6 +16,11 @@ ref: Enable FIPS: * "false" (default) - do not enable FIPS * "true" - enable FIPS + - name: OS_IMAGE_STREAM + default: "" + documentation: |- + OSImageStream is the global OS Image Stream to be used for all machines in the cluster. + Valid Values: "rhel-9","rhel-10" - name: BASELINE_CAPABILITY_SET default: "" documentation: |- From f8794613ff30d69140b95ee1b3652d95fbf53b73 Mon Sep 17 00:00:00 2001 From: Patrick Dillon Date: Mon, 2 Mar 2026 16:32:35 -0500 Subject: [PATCH 2/2] installer rhel-10 presubmit Adds preliminary presubmit for testing rhel10 installs on aws. --- .../installer/openshift-installer-main.yaml | 9 +++ .../openshift-installer-main-presubmits.yaml | 81 +++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/ci-operator/config/openshift/installer/openshift-installer-main.yaml b/ci-operator/config/openshift/installer/openshift-installer-main.yaml index 0933a0da93bbb..0fab8e4ed26d7 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-main.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-main.yaml @@ -451,6 +451,15 @@ tests: - chain: ipi-install test: - ref: openshift-e2e-test +- as: e2e-aws-ovn-rhcos10-devpreview + optional: true + steps: + cluster_profile: aws-4 + env: + AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes" + FEATURE_SET: DevPreviewNoUpgrade + OS_IMAGE_STREAM: rhel-10 + workflow: openshift-e2e-aws - as: e2e-gcp-ovn run_if_changed: (gcp|google) steps: diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-main-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-main-presubmits.yaml index b0edbae030cec..c2e49d428bf0e 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-main-presubmits.yaml @@ -2598,6 +2598,87 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-ovn-public-subnets,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build10 + context: ci/prow/e2e-aws-ovn-rhcos10-devpreview + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-4 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-installer-main-e2e-aws-ovn-rhcos10-devpreview + optional: true + rerun_command: /test e2e-aws-ovn-rhcos10-devpreview + 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-ovn-rhcos10-devpreview + 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-ovn-rhcos10-devpreview,?($|\s.*) - agent: kubernetes always_run: false branches: