From b7764625ad90845263b6a156cb50af818f045cb2 Mon Sep 17 00:00:00 2001 From: Rohit Patil Date: Mon, 9 Feb 2026 19:42:23 +0530 Subject: [PATCH 1/3] Add OTE CI jobs with timeout configuration for cluster-authentication-operator This adds OTE (OpenShift Tests Extension) CI jobs for various test profiles including encryption, encryption-rotation, encryption-perf, encryption-kms, and OIDC tests. All jobs are configured as optional with appropriate timeout values (1h-4h) based on test complexity. Jobs use either parallel or serial TEST_SUITE execution modes. Co-Authored-By: Rohit Patil --- ...luster-authentication-operator-master.yaml | 57 +++ ...entication-operator-master-presubmits.yaml | 379 ++++++++++++++++++ 2 files changed, 436 insertions(+) diff --git a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml index 70b5e98ae4251..e2e0a25752d99 100644 --- a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml @@ -245,6 +245,7 @@ tests: test: - ref: openshift-e2e-test workflow: ipi-aws + timeout: 1h0m0s - always_run: true as: e2e-aws-operator-serial-ote optional: true @@ -255,6 +256,62 @@ tests: test: - ref: openshift-e2e-test workflow: ipi-aws + timeout: 1h0m0s +- always_run: true + as: e2e-aws-operator-encryption-serial-ote + optional: true + steps: + cluster_profile: aws + env: + TEST_SUITE: openshift/cluster-authentication-operator/operator/serial + test: + - ref: openshift-e2e-test + workflow: ipi-aws + timeout: 4h0m0s +- always_run: true + as: e2e-aws-operator-encryption-rotation-serial-ote + optional: true + steps: + cluster_profile: aws + env: + TEST_SUITE: openshift/cluster-authentication-operator/operator/serial + test: + - ref: openshift-e2e-test + workflow: ipi-aws + timeout: 4h0m0s +- always_run: true + as: e2e-aws-operator-encryption-perf-serial-ote + optional: true + steps: + cluster_profile: aws + env: + TEST_SUITE: openshift/cluster-authentication-operator/operator/serial + test: + - ref: openshift-e2e-test + workflow: ipi-aws + timeout: 2h0m0s +- always_run: true + as: e2e-aws-operator-encryption-kms-serial-ote + optional: true + steps: + cluster_profile: aws + env: + TEST_SUITE: openshift/cluster-authentication-operator/operator/serial + test: + - ref: openshift-e2e-test + workflow: ipi-aws + timeout: 4h0m0s +- always_run: true + as: e2e-aws-oidc-parallel-ote + optional: true + steps: + cluster_profile: aws + env: + TEST_SUITE: openshift/cluster-authentication-operator/operator/parallel + test: + - ref: openshift-e2e-test + workflow: ipi-aws + timeout: 4h0m0s zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml index 3d862ad6b4f28..a1459d20633a2 100644 --- a/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml @@ -368,6 +368,381 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-external-oidc-conformance-serial,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build05 + context: ci/prow/e2e-aws-oidc-parallel-ote + decorate: true + decoration_config: + timeout: 4h0m0s + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-oidc-parallel-ote + optional: true + rerun_command: /test e2e-aws-oidc-parallel-ote + 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-oidc-parallel-ote + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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-oidc-parallel-ote,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build05 + context: ci/prow/e2e-aws-operator-encryption-kms-serial-ote + decorate: true + decoration_config: + timeout: 4h0m0s + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-kms-serial-ote + optional: true + rerun_command: /test e2e-aws-operator-encryption-kms-serial-ote + 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-operator-encryption-kms-serial-ote + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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-operator-encryption-kms-serial-ote,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build05 + context: ci/prow/e2e-aws-operator-encryption-perf-serial-ote + decorate: true + decoration_config: + timeout: 2h0m0s + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-perf-serial-ote + optional: true + rerun_command: /test e2e-aws-operator-encryption-perf-serial-ote + 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-operator-encryption-perf-serial-ote + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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-operator-encryption-perf-serial-ote,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build05 + context: ci/prow/e2e-aws-operator-encryption-rotation-serial-ote + decorate: true + decoration_config: + timeout: 4h0m0s + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-rotation-serial-ote + optional: true + rerun_command: /test e2e-aws-operator-encryption-rotation-serial-ote + 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-operator-encryption-rotation-serial-ote + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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-operator-encryption-rotation-serial-ote,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build05 + context: ci/prow/e2e-aws-operator-encryption-serial-ote + decorate: true + decoration_config: + timeout: 4h0m0s + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-serial-ote + optional: true + rerun_command: /test e2e-aws-operator-encryption-serial-ote + 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-operator-encryption-serial-ote + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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-operator-encryption-serial-ote,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -376,6 +751,8 @@ presubmits: cluster: build05 context: ci/prow/e2e-aws-operator-parallel-ote decorate: true + decoration_config: + timeout: 1h0m0s labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws @@ -449,6 +826,8 @@ presubmits: cluster: build05 context: ci/prow/e2e-aws-operator-serial-ote decorate: true + decoration_config: + timeout: 1h0m0s labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: aws From 154861a436ea705b15ca1ad82d31aede8f0048d8 Mon Sep 17 00:00:00 2001 From: Rohit Patil Date: Tue, 10 Feb 2026 10:35:38 +0530 Subject: [PATCH 2/3] Shard OTE serial jobs and fix TEST_SUITE values for cluster-authentication-operator Split all serial jobs with always_run into 2 shards to improve reliability and prevent timeout issues. This addresses review feedback to follow the pattern established in PR #67414. Additionally, fix TEST_SUITE environment variables to match job-specific test suites instead of using generic paths. Each job now runs its intended test suite: - operator-encryption/serial - operator-encryption-rotation/serial - operator-encryption-perf/serial - operator-encryption-kms/serial - oidc/parallel Jobs sharded: - e2e-aws-operator-encryption-serial-ote (4h timeout) - e2e-aws-operator-encryption-rotation-serial-ote (4h timeout) - e2e-aws-operator-encryption-perf-serial-ote (2h timeout) - e2e-aws-operator-encryption-kms-serial-ote (4h timeout) Co-Authored-By: Rohit Patil --- ...luster-authentication-operator-master.yaml | 14 +- ...entication-operator-master-presubmits.yaml | 340 +++++++++++++++++- 2 files changed, 333 insertions(+), 21 deletions(-) diff --git a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml index e2e0a25752d99..0e85992dd2ea5 100644 --- a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml @@ -260,10 +260,11 @@ tests: - always_run: true as: e2e-aws-operator-encryption-serial-ote optional: true + shard_count: 2 steps: cluster_profile: aws env: - TEST_SUITE: openshift/cluster-authentication-operator/operator/serial + TEST_SUITE: openshift/cluster-authentication-operator/operator-encryption/serial test: - ref: openshift-e2e-test workflow: ipi-aws @@ -271,10 +272,11 @@ tests: - always_run: true as: e2e-aws-operator-encryption-rotation-serial-ote optional: true + shard_count: 2 steps: cluster_profile: aws env: - TEST_SUITE: openshift/cluster-authentication-operator/operator/serial + TEST_SUITE: openshift/cluster-authentication-operator/operator-encryption-rotation/serial test: - ref: openshift-e2e-test workflow: ipi-aws @@ -282,10 +284,11 @@ tests: - always_run: true as: e2e-aws-operator-encryption-perf-serial-ote optional: true + shard_count: 2 steps: cluster_profile: aws env: - TEST_SUITE: openshift/cluster-authentication-operator/operator/serial + TEST_SUITE: openshift/cluster-authentication-operator/operator-encryption-perf/serial test: - ref: openshift-e2e-test workflow: ipi-aws @@ -293,10 +296,11 @@ tests: - always_run: true as: e2e-aws-operator-encryption-kms-serial-ote optional: true + shard_count: 2 steps: cluster_profile: aws env: - TEST_SUITE: openshift/cluster-authentication-operator/operator/serial + TEST_SUITE: openshift/cluster-authentication-operator/operator-encryption-kms/serial test: - ref: openshift-e2e-test workflow: ipi-aws @@ -307,7 +311,7 @@ tests: steps: cluster_profile: aws env: - TEST_SUITE: openshift/cluster-authentication-operator/operator/parallel + TEST_SUITE: openshift/cluster-authentication-operator/oidc/parallel test: - ref: openshift-e2e-test workflow: ipi-aws diff --git a/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml index a1459d20633a2..31f65d56c41ec 100644 --- a/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml @@ -449,7 +449,7 @@ presubmits: - ^master$ - ^master- cluster: build05 - context: ci/prow/e2e-aws-operator-encryption-kms-serial-ote + context: ci/prow/e2e-aws-operator-encryption-kms-serial-ote-1of2 decorate: true decoration_config: timeout: 4h0m0s @@ -458,15 +458,16 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-kms-serial-ote + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-kms-serial-ote-1of2 optional: true - rerun_command: /test e2e-aws-operator-encryption-kms-serial-ote + rerun_command: /test e2e-aws-operator-encryption-kms-serial-ote-1of2 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1" - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=e2e-aws-operator-encryption-kms-serial-ote @@ -517,14 +518,166 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator-encryption-kms-serial-ote,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator-encryption-kms-serial-ote-1of2,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build05 - context: ci/prow/e2e-aws-operator-encryption-perf-serial-ote + context: ci/prow/e2e-aws-operator-encryption-kms-serial-ote-2of2 + decorate: true + decoration_config: + timeout: 4h0m0s + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-kms-serial-ote-2of2 + optional: true + rerun_command: /test e2e-aws-operator-encryption-kms-serial-ote-2of2 + 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-operator-encryption-kms-serial-ote + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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-operator-encryption-kms-serial-ote-2of2,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build05 + context: ci/prow/e2e-aws-operator-encryption-perf-serial-ote-1of2 + decorate: true + decoration_config: + timeout: 2h0m0s + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-perf-serial-ote-1of2 + optional: true + rerun_command: /test e2e-aws-operator-encryption-perf-serial-ote-1of2 + 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-operator-encryption-perf-serial-ote + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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-operator-encryption-perf-serial-ote-1of2,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build05 + context: ci/prow/e2e-aws-operator-encryption-perf-serial-ote-2of2 decorate: true decoration_config: timeout: 2h0m0s @@ -533,15 +686,16 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-perf-serial-ote + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-perf-serial-ote-2of2 optional: true - rerun_command: /test e2e-aws-operator-encryption-perf-serial-ote + rerun_command: /test e2e-aws-operator-encryption-perf-serial-ote-2of2 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2" - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=e2e-aws-operator-encryption-perf-serial-ote @@ -592,14 +746,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator-encryption-perf-serial-ote,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator-encryption-perf-serial-ote-2of2,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build05 - context: ci/prow/e2e-aws-operator-encryption-rotation-serial-ote + context: ci/prow/e2e-aws-operator-encryption-rotation-serial-ote-1of2 decorate: true decoration_config: timeout: 4h0m0s @@ -608,15 +762,16 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-rotation-serial-ote + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-rotation-serial-ote-1of2 optional: true - rerun_command: /test e2e-aws-operator-encryption-rotation-serial-ote + rerun_command: /test e2e-aws-operator-encryption-rotation-serial-ote-1of2 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1" - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=e2e-aws-operator-encryption-rotation-serial-ote @@ -667,14 +822,166 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator-encryption-rotation-serial-ote,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator-encryption-rotation-serial-ote-1of2,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build05 + context: ci/prow/e2e-aws-operator-encryption-rotation-serial-ote-2of2 + decorate: true + decoration_config: + timeout: 4h0m0s + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-rotation-serial-ote-2of2 + optional: true + rerun_command: /test e2e-aws-operator-encryption-rotation-serial-ote-2of2 + 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-operator-encryption-rotation-serial-ote + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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-operator-encryption-rotation-serial-ote-2of2,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build05 + context: ci/prow/e2e-aws-operator-encryption-serial-ote-1of2 + decorate: true + decoration_config: + timeout: 4h0m0s + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-serial-ote-1of2 + optional: true + rerun_command: /test e2e-aws-operator-encryption-serial-ote-1of2 + 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 1" + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=e2e-aws-operator-encryption-serial-ote + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + 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-operator-encryption-serial-ote-1of2,?($|\s.*) - agent: kubernetes always_run: true branches: - ^master$ - ^master- cluster: build05 - context: ci/prow/e2e-aws-operator-encryption-serial-ote + context: ci/prow/e2e-aws-operator-encryption-serial-ote-2of2 decorate: true decoration_config: timeout: 4h0m0s @@ -683,15 +990,16 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-serial-ote + name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-operator-encryption-serial-ote-2of2 optional: true - rerun_command: /test e2e-aws-operator-encryption-serial-ote + rerun_command: /test e2e-aws-operator-encryption-serial-ote-2of2 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 + - --multi-stage-param=SHARD_ARGS="--shard-count 2 --shard-id 2" - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - --target=e2e-aws-operator-encryption-serial-ote @@ -742,7 +1050,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator-encryption-serial-ote,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator-encryption-serial-ote-2of2,?($|\s.*) - agent: kubernetes always_run: true branches: From 93c2c7db0baa070e5e0f25df3a35f2fd2bd0de1d Mon Sep 17 00:00:00 2001 From: Rohit Patil Date: Wed, 11 Feb 2026 16:49:22 +0530 Subject: [PATCH 3/3] Remove e2e-aws-oidc-parallel-ote test from cluster-authentication-operator This test profile is no longer needed and has been removed from the master branch configuration. Co-Authored-By: Rohit Patil --- ...luster-authentication-operator-master.yaml | 11 --- ...entication-operator-master-presubmits.yaml | 75 ------------------- 2 files changed, 86 deletions(-) diff --git a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml index 0e85992dd2ea5..08f0aa06af8ac 100644 --- a/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml @@ -305,17 +305,6 @@ tests: - ref: openshift-e2e-test workflow: ipi-aws timeout: 4h0m0s -- always_run: true - as: e2e-aws-oidc-parallel-ote - optional: true - steps: - cluster_profile: aws - env: - TEST_SUITE: openshift/cluster-authentication-operator/oidc/parallel - test: - - ref: openshift-e2e-test - workflow: ipi-aws - timeout: 4h0m0s zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml index 31f65d56c41ec..792aae945f821 100644 --- a/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml @@ -368,81 +368,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-external-oidc-conformance-serial,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build05 - context: ci/prow/e2e-aws-oidc-parallel-ote - decorate: true - decoration_config: - timeout: 4h0m0s - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-oidc-parallel-ote - optional: true - rerun_command: /test e2e-aws-oidc-parallel-ote - 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-oidc-parallel-ote - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - 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-oidc-parallel-ote,?($|\s.*) - agent: kubernetes always_run: true branches: