Skip to content

Commit f01ab83

Browse files
authored
Add auth operator OIDC presubmit for Default featureset (#69918)
* cao/oidc: increase job timeout to 4h to match test config * cao/oidc: add oidc job for the default cluster profile
1 parent 48b5ff2 commit f01ab83

File tree

5 files changed

+175
-3
lines changed

5 files changed

+175
-3
lines changed

ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,21 @@ tests:
167167
resources:
168168
requests:
169169
cpu: 100m
170-
timeout: 3h0m0s
170+
timeout: 4h0m0s
171+
workflow: ipi-gcp
172+
- as: e2e-oidc
173+
steps:
174+
cluster_profile: gcp
175+
test:
176+
- as: test
177+
cli: latest
178+
commands: |
179+
make test-e2e-oidc JUNITFILE=${ARTIFACT_DIR}/junit_report.xml
180+
from: src
181+
resources:
182+
requests:
183+
cpu: 100m
184+
timeout: 4h0m0s
171185
workflow: ipi-gcp
172186
- always_run: false
173187
as: e2e-aws-single-node

ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.20.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ tests:
167167
resources:
168168
requests:
169169
cpu: 100m
170-
timeout: 3h0m0s
170+
timeout: 4h0m0s
171171
workflow: ipi-gcp
172172
- always_run: false
173173
as: e2e-aws-single-node

ci-operator/config/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.21.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,21 @@ tests:
168168
resources:
169169
requests:
170170
cpu: 100m
171-
timeout: 3h0m0s
171+
timeout: 4h0m0s
172+
workflow: ipi-gcp
173+
- as: e2e-oidc
174+
steps:
175+
cluster_profile: gcp
176+
test:
177+
- as: test
178+
cli: latest
179+
commands: |
180+
make test-e2e-oidc JUNITFILE=${ARTIFACT_DIR}/junit_report.xml
181+
from: src
182+
resources:
183+
requests:
184+
cpu: 100m
185+
timeout: 4h0m0s
172186
workflow: ipi-gcp
173187
- always_run: false
174188
as: e2e-aws-single-node

ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-master-presubmits.yaml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,78 @@ presubmits:
509509
secret:
510510
secretName: result-aggregator
511511
trigger: (?m)^/test( | .* )e2e-gcp-operator-encryption-rotation,?($|\s.*)
512+
- agent: kubernetes
513+
always_run: true
514+
branches:
515+
- ^master$
516+
- ^master-
517+
cluster: build04
518+
context: ci/prow/e2e-oidc
519+
decorate: true
520+
labels:
521+
ci-operator.openshift.io/cloud: gcp
522+
ci-operator.openshift.io/cloud-cluster-profile: gcp
523+
ci.openshift.io/generator: prowgen
524+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
525+
name: pull-ci-openshift-cluster-authentication-operator-master-e2e-oidc
526+
rerun_command: /test e2e-oidc
527+
spec:
528+
containers:
529+
- args:
530+
- --gcs-upload-secret=/secrets/gcs/service-account.json
531+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
532+
- --lease-server-credentials-file=/etc/boskos/credentials
533+
- --report-credentials-file=/etc/report/credentials
534+
- --secret-dir=/secrets/ci-pull-credentials
535+
- --target=e2e-oidc
536+
command:
537+
- ci-operator
538+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
539+
imagePullPolicy: Always
540+
name: ""
541+
resources:
542+
requests:
543+
cpu: 10m
544+
volumeMounts:
545+
- mountPath: /etc/boskos
546+
name: boskos
547+
readOnly: true
548+
- mountPath: /secrets/ci-pull-credentials
549+
name: ci-pull-credentials
550+
readOnly: true
551+
- mountPath: /secrets/gcs
552+
name: gcs-credentials
553+
readOnly: true
554+
- mountPath: /secrets/manifest-tool
555+
name: manifest-tool-local-pusher
556+
readOnly: true
557+
- mountPath: /etc/pull-secret
558+
name: pull-secret
559+
readOnly: true
560+
- mountPath: /etc/report
561+
name: result-aggregator
562+
readOnly: true
563+
serviceAccountName: ci-operator
564+
volumes:
565+
- name: boskos
566+
secret:
567+
items:
568+
- key: credentials
569+
path: credentials
570+
secretName: boskos-credentials
571+
- name: ci-pull-credentials
572+
secret:
573+
secretName: ci-pull-credentials
574+
- name: manifest-tool-local-pusher
575+
secret:
576+
secretName: manifest-tool-local-pusher
577+
- name: pull-secret
578+
secret:
579+
secretName: registry-pull-credentials
580+
- name: result-aggregator
581+
secret:
582+
secretName: result-aggregator
583+
trigger: (?m)^/test( | .* )e2e-oidc,?($|\s.*)
512584
- agent: kubernetes
513585
always_run: false
514586
branches:

ci-operator/jobs/openshift/cluster-authentication-operator/openshift-cluster-authentication-operator-release-4.21-presubmits.yaml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,78 @@ presubmits:
509509
secret:
510510
secretName: result-aggregator
511511
trigger: (?m)^/test( | .* )e2e-gcp-operator-encryption-rotation,?($|\s.*)
512+
- agent: kubernetes
513+
always_run: true
514+
branches:
515+
- ^release-4\.21$
516+
- ^release-4\.21-
517+
cluster: build04
518+
context: ci/prow/e2e-oidc
519+
decorate: true
520+
labels:
521+
ci-operator.openshift.io/cloud: gcp
522+
ci-operator.openshift.io/cloud-cluster-profile: gcp
523+
ci.openshift.io/generator: prowgen
524+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
525+
name: pull-ci-openshift-cluster-authentication-operator-release-4.21-e2e-oidc
526+
rerun_command: /test e2e-oidc
527+
spec:
528+
containers:
529+
- args:
530+
- --gcs-upload-secret=/secrets/gcs/service-account.json
531+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
532+
- --lease-server-credentials-file=/etc/boskos/credentials
533+
- --report-credentials-file=/etc/report/credentials
534+
- --secret-dir=/secrets/ci-pull-credentials
535+
- --target=e2e-oidc
536+
command:
537+
- ci-operator
538+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
539+
imagePullPolicy: Always
540+
name: ""
541+
resources:
542+
requests:
543+
cpu: 10m
544+
volumeMounts:
545+
- mountPath: /etc/boskos
546+
name: boskos
547+
readOnly: true
548+
- mountPath: /secrets/ci-pull-credentials
549+
name: ci-pull-credentials
550+
readOnly: true
551+
- mountPath: /secrets/gcs
552+
name: gcs-credentials
553+
readOnly: true
554+
- mountPath: /secrets/manifest-tool
555+
name: manifest-tool-local-pusher
556+
readOnly: true
557+
- mountPath: /etc/pull-secret
558+
name: pull-secret
559+
readOnly: true
560+
- mountPath: /etc/report
561+
name: result-aggregator
562+
readOnly: true
563+
serviceAccountName: ci-operator
564+
volumes:
565+
- name: boskos
566+
secret:
567+
items:
568+
- key: credentials
569+
path: credentials
570+
secretName: boskos-credentials
571+
- name: ci-pull-credentials
572+
secret:
573+
secretName: ci-pull-credentials
574+
- name: manifest-tool-local-pusher
575+
secret:
576+
secretName: manifest-tool-local-pusher
577+
- name: pull-secret
578+
secret:
579+
secretName: registry-pull-credentials
580+
- name: result-aggregator
581+
secret:
582+
secretName: result-aggregator
583+
trigger: (?m)^/test( | .* )e2e-oidc,?($|\s.*)
512584
- agent: kubernetes
513585
always_run: false
514586
branches:

0 commit comments

Comments
 (0)