From c37713f715935a43c0a419eafe7264cad8de522f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Ma=C5=88=C3=A1k?= Date: Mon, 22 Jun 2026 12:49:33 +0200 Subject: [PATCH 1/3] Cluster cloud controller manager operator: add trigger-only AWS CCM regression presubmit Add the AWS CCM regression presubmit and keep it trigger-only so it runs only when explicitly requested. Co-authored-by: Cursor --- ...loud-controller-manager-operator-main.yaml | 11 +++ ...ller-manager-operator-main-presubmits.yaml | 85 +++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml index 9760e5debac77..3a6cd3d264e3d 100644 --- a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml +++ b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml @@ -157,6 +157,17 @@ tests: test: - chain: openshift-e2e-test-clusterinfra-qe-regression workflow: cucushift-installer-rehearse-vsphere-ipi +- as: regression-clusterinfra-aws-ipi-ccm + optional: true + steps: + cluster_profile: openshift-org-aws + env: + E2E_RUN_TAGS: '@ccm' + TEST_FILTERS_CLUSTERINFRASTRUCTURE: ccm&&!qe-only + TEST_SCENARIOS: Cluster_Infrastructure CCM + test: + - chain: openshift-e2e-test-clusterinfra-qe-regression + workflow: cucushift-installer-rehearse-aws-ipi - always_run: false as: e2e-nutanix-ovn cluster: build01 diff --git a/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main-presubmits.yaml index a662197c9e9f4..328dad1fd13a0 100644 --- a/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main-presubmits.yaml @@ -1442,6 +1442,91 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )okd-scos-images,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build01 + context: ci/prow/regression-clusterinfra-aws-ipi-ccm + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-cloud-controller-manager-operator-main-regression-clusterinfra-aws-ipi-ccm + optional: true + rerun_command: /test regression-clusterinfra-aws-ipi-ccm + 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=regression-clusterinfra-aws-ipi-ccm + 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( | .* )regression-clusterinfra-aws-ipi-ccm,?($|\s.*) - agent: kubernetes always_run: false branches: From 31d372779231bb9051acda9d59a4661e008dd1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Ma=C5=88=C3=A1k?= Date: Mon, 22 Jun 2026 13:10:55 +0200 Subject: [PATCH 2/3] Cluster cloud controller manager operator: mark AWS CCM regression presubmit trigger-only Set always_run to false in the source ci-operator config so generated Prow config matches the intended trigger-only behavior. Co-authored-by: Cursor --- ...openshift-cluster-cloud-controller-manager-operator-main.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml index 3a6cd3d264e3d..acdb2b57765f4 100644 --- a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml +++ b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml @@ -158,6 +158,7 @@ tests: - chain: openshift-e2e-test-clusterinfra-qe-regression workflow: cucushift-installer-rehearse-vsphere-ipi - as: regression-clusterinfra-aws-ipi-ccm + always_run: false optional: true steps: cluster_profile: openshift-org-aws From be4e9b9f760c9032f5cea169e59f1f0f398309d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Ma=C5=88=C3=A1k?= Date: Mon, 22 Jun 2026 13:56:45 +0200 Subject: [PATCH 3/3] Cluster cloud controller manager operator: fix AWS CCM job field order for metadata Place always_run before as so determinize-ci-operator output matches the source config. Co-authored-by: Cursor --- ...nshift-cluster-cloud-controller-manager-operator-main.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml index acdb2b57765f4..b4db446643067 100644 --- a/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml +++ b/ci-operator/config/openshift/cluster-cloud-controller-manager-operator/openshift-cluster-cloud-controller-manager-operator-main.yaml @@ -157,8 +157,8 @@ tests: test: - chain: openshift-e2e-test-clusterinfra-qe-regression workflow: cucushift-installer-rehearse-vsphere-ipi -- as: regression-clusterinfra-aws-ipi-ccm - always_run: false +- always_run: false + as: regression-clusterinfra-aws-ipi-ccm optional: true steps: cluster_profile: openshift-org-aws