Skip to content

Add e2e-aws-operator-serial-ote test for cluster-config-operator #73356

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

Open
wangke19 wants to merge 1 commit into
base: main
Choose a base branch
from
+78 −72
Open

Add e2e-aws-operator-serial-ote test for cluster-config-operator #73356

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
18 changes: 6 additions & 12 deletions ...ator/config/openshift/cluster-config-operator/openshift-cluster-config-operator-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,15 @@ tests:
steps:
cluster_profile: aws
workflow: openshift-upgrade-aws
- always_run: false
as: e2e-tests-extension
- as: e2e-aws-operator-serial-ote
optional: true
steps:
cluster_profile: aws
env:
TEST_SUITE: openshift/cluster-config-operator/operator/serial
Copy link
Contributor

@p0lyn0mial p0lyn0mial Jan 13, 2026

Choose a reason for hiding this comment

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

are you sure we would like the serial suite ?

xref: openshift/cluster-config-operator@54909bc#r2686139445

test:
- as: tests-extension
commands: |
echo "Build binary cluster-config-operator-tests-ext"
make tests-ext-build
echo "Running ./cluster-config-operator-tests-ext with sanity test"
./cluster-config-operator-tests-ext run-suite openshift/cluster-config-operator/conformance/parallel -j ${ARTIFACT_DIR}/junit_$(shell date +%Y%m%d-%H%M%S).xml
from: src
resources:
requests:
cpu: 100m
- ref: openshift-e2e-test
workflow: ipi-aws
zz_generated_metadata:
branch: main
org: openshift
Expand Down
132 changes: 72 additions & 60 deletions .../openshift/cluster-config-operator/openshift-cluster-config-operator-main-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ presubmits:
branches:
- ^main$
- ^main-
cluster: build10
context: ci/prow/e2e-aws-ovn
cluster: build01
context: ci/prow/e2e-aws-operator-serial-ote
decorate: true
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-config-operator-main-e2e-aws-ovn
rerun_command: /test e2e-aws-ovn
name: pull-ci-openshift-cluster-config-operator-main-e2e-aws-operator-serial-ote
optional: true
rerun_command: /test e2e-aws-operator-serial-ote
spec:
containers:
- args:
Expand All @@ -23,7 +24,7 @@ presubmits:
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-aws-ovn
- --target=e2e-aws-operator-serial-ote
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
Expand Down Expand Up @@ -71,22 +72,22 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-aws-operator-serial-ote,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^main$
- ^main-
cluster: build10
context: ci/prow/e2e-aws-ovn-techpreview
context: ci/prow/e2e-aws-ovn
decorate: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-2
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-config-operator-main-e2e-aws-ovn-techpreview
rerun_command: /test e2e-aws-ovn-techpreview
name: pull-ci-openshift-cluster-config-operator-main-e2e-aws-ovn
rerun_command: /test e2e-aws-ovn
spec:
containers:
- args:
Expand All @@ -95,7 +96,7 @@ presubmits:
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-aws-ovn-techpreview
- --target=e2e-aws-ovn
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
Expand Down Expand Up @@ -143,32 +144,31 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-ovn-techpreview,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^main$
- ^main-
cluster: build10
context: ci/prow/e2e-aws-serial-1of2
context: ci/prow/e2e-aws-ovn-techpreview
decorate: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-2
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-cluster-config-operator-main-e2e-aws-serial-1of2
rerun_command: /test e2e-aws-serial-1of2
name: pull-ci-openshift-cluster-config-operator-main-e2e-aws-ovn-techpreview
rerun_command: /test e2e-aws-ovn-techpreview
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-serial
- --target=e2e-aws-ovn-techpreview
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
Expand Down Expand Up @@ -216,29 +216,29 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-serial-1of2,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-aws-ovn-techpreview,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^main$
- ^main-
cluster: build10
context: ci/prow/e2e-aws-serial-2of2
context: ci/prow/e2e-aws-serial-1of2
decorate: true
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-config-operator-main-e2e-aws-serial-2of2
rerun_command: /test e2e-aws-serial-2of2
name: pull-ci-openshift-cluster-config-operator-main-e2e-aws-serial-1of2
rerun_command: /test e2e-aws-serial-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 2"
- --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-serial
Expand Down Expand Up @@ -289,32 +289,32 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-serial-2of2,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-aws-serial-1of2,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^main$
- ^main-
cluster: build10
context: ci/prow/e2e-aws-serial-techpreview-1of2
context: ci/prow/e2e-aws-serial-2of2
decorate: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-3
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-config-operator-main-e2e-aws-serial-techpreview-1of2
rerun_command: /test e2e-aws-serial-techpreview-1of2
name: pull-ci-openshift-cluster-config-operator-main-e2e-aws-serial-2of2
rerun_command: /test e2e-aws-serial-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 1"
- --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-serial-techpreview
- --target=e2e-aws-serial
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
Expand Down Expand Up @@ -362,29 +362,29 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-serial-techpreview-1of2,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-aws-serial-2of2,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^main$
- ^main-
cluster: build10
context: ci/prow/e2e-aws-serial-techpreview-2of2
context: ci/prow/e2e-aws-serial-techpreview-1of2
decorate: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-3
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-cluster-config-operator-main-e2e-aws-serial-techpreview-2of2
rerun_command: /test e2e-aws-serial-techpreview-2of2
name: pull-ci-openshift-cluster-config-operator-main-e2e-aws-serial-techpreview-1of2
rerun_command: /test e2e-aws-serial-techpreview-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 2"
- --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-serial-techpreview
Expand Down Expand Up @@ -435,32 +435,32 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws-serial-techpreview-2of2,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-aws-serial-techpreview-1of2,?($|\s.*)
- agent: kubernetes
always_run: false
always_run: true
branches:
- ^main$
- ^main-
cluster: build01
context: ci/prow/e2e-azure
cluster: build10
context: ci/prow/e2e-aws-serial-techpreview-2of2
decorate: true
labels:
ci-operator.openshift.io/cloud: azure4
ci-operator.openshift.io/cloud-cluster-profile: azure4
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-3
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-cluster-config-operator-main-e2e-azure
optional: true
rerun_command: /test e2e-azure
name: pull-ci-openshift-cluster-config-operator-main-e2e-aws-serial-techpreview-2of2
rerun_command: /test e2e-aws-serial-techpreview-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-azure
- --target=e2e-aws-serial-techpreview
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
Expand Down Expand Up @@ -508,23 +508,23 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-aws-serial-techpreview-2of2,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^main$
- ^main-
cluster: build02
context: ci/prow/e2e-gcp
cluster: build01
context: ci/prow/e2e-azure
decorate: true
labels:
ci-operator.openshift.io/cloud: gcp
ci-operator.openshift.io/cloud-cluster-profile: gcp
ci-operator.openshift.io/cloud: azure4
ci-operator.openshift.io/cloud-cluster-profile: azure4
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-cluster-config-operator-main-e2e-gcp
name: pull-ci-openshift-cluster-config-operator-main-e2e-azure
optional: true
rerun_command: /test e2e-gcp
rerun_command: /test e2e-azure
spec:
containers:
- args:
Expand All @@ -533,7 +533,7 @@ presubmits:
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=e2e-gcp
- --target=e2e-azure
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
Expand Down Expand Up @@ -581,29 +581,32 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^main$
- ^main-
cluster: build01
context: ci/prow/e2e-tests-extension
cluster: build02
context: ci/prow/e2e-gcp
decorate: true
labels:
ci-operator.openshift.io/cloud: gcp
ci-operator.openshift.io/cloud-cluster-profile: gcp
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-cluster-config-operator-main-e2e-tests-extension
name: pull-ci-openshift-cluster-config-operator-main-e2e-gcp
optional: true
rerun_command: /test e2e-tests-extension
rerun_command: /test e2e-gcp
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-tests-extension
- --target=e2e-gcp
command:
- ci-operator
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
Expand All @@ -613,6 +616,9 @@ presubmits:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
Expand All @@ -630,6 +636,12 @@ presubmits:
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
Expand All @@ -642,7 +654,7 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-tests-extension,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down