Skip to content

Commit d4e6010

Browse files
committed
wip: use presubmits for testing instead of periodics
Signed-off-by: Bryce Palmer <[email protected]>
1 parent 0d49f8a commit d4e6010

6 files changed

+258
-411
lines changed

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,39 @@ tests:
179179
container:
180180
from: src
181181
optional: true
182+
- always_run: false
183+
as: e2e-aws-external-oidc
184+
optional: true
185+
steps:
186+
cluster_profile: aws-3
187+
env:
188+
FEATURE_SET: TechPreviewNoUpgrade
189+
OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
190+
TEST_SUITE: openshift/auth/external-oidc
191+
workflow: openshift-e2e-aws
192+
timeout: 8h0m0s
193+
- always_run: false
194+
as: e2e-azure-external-oidc
195+
optional: true
196+
steps:
197+
cluster_profile: azure4
198+
env:
199+
FEATURE_SET: TechPreviewNoUpgrade
200+
OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
201+
TEST_SUITE: openshift/auth/external-oidc
202+
workflow: openshift-e2e-azure
203+
timeout: 8h0m0s
204+
- always_run: false
205+
as: e2e-gcp-external-oidc
206+
optional: true
207+
steps:
208+
cluster_profile: gcp
209+
env:
210+
FEATURE_SET: TechPreviewNoUpgrade
211+
OPENSHIFT_SKIP_EXTERNAL_TESTS: "True"
212+
TEST_SUITE: openshift/auth/external-oidc
213+
workflow: openshift-e2e-gcp
214+
timeout: 8h0m0s
182215
zz_generated_metadata:
183216
branch: master
184217
org: openshift

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

Lines changed: 0 additions & 79 deletions
This file was deleted.

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

Lines changed: 225 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,81 @@ presubmits:
218218
secret:
219219
secretName: result-aggregator
220220
trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*)
221+
- agent: kubernetes
222+
always_run: false
223+
branches:
224+
- ^master$
225+
- ^master-
226+
cluster: build01
227+
context: ci/prow/e2e-aws-external-oidc
228+
decorate: true
229+
decoration_config:
230+
timeout: 8h0m0s
231+
labels:
232+
ci-operator.openshift.io/cloud: aws
233+
ci-operator.openshift.io/cloud-cluster-profile: aws-3
234+
ci.openshift.io/generator: prowgen
235+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
236+
name: pull-ci-openshift-cluster-authentication-operator-master-e2e-aws-external-oidc
237+
optional: true
238+
rerun_command: /test e2e-aws-external-oidc
239+
spec:
240+
containers:
241+
- args:
242+
- --gcs-upload-secret=/secrets/gcs/service-account.json
243+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
244+
- --lease-server-credentials-file=/etc/boskos/credentials
245+
- --report-credentials-file=/etc/report/credentials
246+
- --secret-dir=/secrets/ci-pull-credentials
247+
- --target=e2e-aws-external-oidc
248+
command:
249+
- ci-operator
250+
image: ci-operator:latest
251+
imagePullPolicy: Always
252+
name: ""
253+
resources:
254+
requests:
255+
cpu: 10m
256+
volumeMounts:
257+
- mountPath: /etc/boskos
258+
name: boskos
259+
readOnly: true
260+
- mountPath: /secrets/ci-pull-credentials
261+
name: ci-pull-credentials
262+
readOnly: true
263+
- mountPath: /secrets/gcs
264+
name: gcs-credentials
265+
readOnly: true
266+
- mountPath: /secrets/manifest-tool
267+
name: manifest-tool-local-pusher
268+
readOnly: true
269+
- mountPath: /etc/pull-secret
270+
name: pull-secret
271+
readOnly: true
272+
- mountPath: /etc/report
273+
name: result-aggregator
274+
readOnly: true
275+
serviceAccountName: ci-operator
276+
volumes:
277+
- name: boskos
278+
secret:
279+
items:
280+
- key: credentials
281+
path: credentials
282+
secretName: boskos-credentials
283+
- name: ci-pull-credentials
284+
secret:
285+
secretName: ci-pull-credentials
286+
- name: manifest-tool-local-pusher
287+
secret:
288+
secretName: manifest-tool-local-pusher
289+
- name: pull-secret
290+
secret:
291+
secretName: registry-pull-credentials
292+
- name: result-aggregator
293+
secret:
294+
secretName: result-aggregator
295+
trigger: (?m)^/test( | .* )e2e-aws-external-oidc,?($|\s.*)
221296
- agent: kubernetes
222297
always_run: true
223298
branches:
@@ -291,6 +366,81 @@ presubmits:
291366
secret:
292367
secretName: result-aggregator
293368
trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*)
369+
- agent: kubernetes
370+
always_run: false
371+
branches:
372+
- ^master$
373+
- ^master-
374+
cluster: build03
375+
context: ci/prow/e2e-azure-external-oidc
376+
decorate: true
377+
decoration_config:
378+
timeout: 8h0m0s
379+
labels:
380+
ci-operator.openshift.io/cloud: azure4
381+
ci-operator.openshift.io/cloud-cluster-profile: azure4
382+
ci.openshift.io/generator: prowgen
383+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
384+
name: pull-ci-openshift-cluster-authentication-operator-master-e2e-azure-external-oidc
385+
optional: true
386+
rerun_command: /test e2e-azure-external-oidc
387+
spec:
388+
containers:
389+
- args:
390+
- --gcs-upload-secret=/secrets/gcs/service-account.json
391+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
392+
- --lease-server-credentials-file=/etc/boskos/credentials
393+
- --report-credentials-file=/etc/report/credentials
394+
- --secret-dir=/secrets/ci-pull-credentials
395+
- --target=e2e-azure-external-oidc
396+
command:
397+
- ci-operator
398+
image: ci-operator:latest
399+
imagePullPolicy: Always
400+
name: ""
401+
resources:
402+
requests:
403+
cpu: 10m
404+
volumeMounts:
405+
- mountPath: /etc/boskos
406+
name: boskos
407+
readOnly: true
408+
- mountPath: /secrets/ci-pull-credentials
409+
name: ci-pull-credentials
410+
readOnly: true
411+
- mountPath: /secrets/gcs
412+
name: gcs-credentials
413+
readOnly: true
414+
- mountPath: /secrets/manifest-tool
415+
name: manifest-tool-local-pusher
416+
readOnly: true
417+
- mountPath: /etc/pull-secret
418+
name: pull-secret
419+
readOnly: true
420+
- mountPath: /etc/report
421+
name: result-aggregator
422+
readOnly: true
423+
serviceAccountName: ci-operator
424+
volumes:
425+
- name: boskos
426+
secret:
427+
items:
428+
- key: credentials
429+
path: credentials
430+
secretName: boskos-credentials
431+
- name: ci-pull-credentials
432+
secret:
433+
secretName: ci-pull-credentials
434+
- name: manifest-tool-local-pusher
435+
secret:
436+
secretName: manifest-tool-local-pusher
437+
- name: pull-secret
438+
secret:
439+
secretName: registry-pull-credentials
440+
- name: result-aggregator
441+
secret:
442+
secretName: result-aggregator
443+
trigger: (?m)^/test( | .* )e2e-azure-external-oidc,?($|\s.*)
294444
- agent: kubernetes
295445
always_run: true
296446
branches:
@@ -363,6 +513,81 @@ presubmits:
363513
secret:
364514
secretName: result-aggregator
365515
trigger: (?m)^/test( | .* )e2e-console-login,?($|\s.*)
516+
- agent: kubernetes
517+
always_run: false
518+
branches:
519+
- ^master$
520+
- ^master-
521+
cluster: build02
522+
context: ci/prow/e2e-gcp-external-oidc
523+
decorate: true
524+
decoration_config:
525+
timeout: 8h0m0s
526+
labels:
527+
ci-operator.openshift.io/cloud: gcp
528+
ci-operator.openshift.io/cloud-cluster-profile: gcp
529+
ci.openshift.io/generator: prowgen
530+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
531+
name: pull-ci-openshift-cluster-authentication-operator-master-e2e-gcp-external-oidc
532+
optional: true
533+
rerun_command: /test e2e-gcp-external-oidc
534+
spec:
535+
containers:
536+
- args:
537+
- --gcs-upload-secret=/secrets/gcs/service-account.json
538+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
539+
- --lease-server-credentials-file=/etc/boskos/credentials
540+
- --report-credentials-file=/etc/report/credentials
541+
- --secret-dir=/secrets/ci-pull-credentials
542+
- --target=e2e-gcp-external-oidc
543+
command:
544+
- ci-operator
545+
image: ci-operator:latest
546+
imagePullPolicy: Always
547+
name: ""
548+
resources:
549+
requests:
550+
cpu: 10m
551+
volumeMounts:
552+
- mountPath: /etc/boskos
553+
name: boskos
554+
readOnly: true
555+
- mountPath: /secrets/ci-pull-credentials
556+
name: ci-pull-credentials
557+
readOnly: true
558+
- mountPath: /secrets/gcs
559+
name: gcs-credentials
560+
readOnly: true
561+
- mountPath: /secrets/manifest-tool
562+
name: manifest-tool-local-pusher
563+
readOnly: true
564+
- mountPath: /etc/pull-secret
565+
name: pull-secret
566+
readOnly: true
567+
- mountPath: /etc/report
568+
name: result-aggregator
569+
readOnly: true
570+
serviceAccountName: ci-operator
571+
volumes:
572+
- name: boskos
573+
secret:
574+
items:
575+
- key: credentials
576+
path: credentials
577+
secretName: boskos-credentials
578+
- name: ci-pull-credentials
579+
secret:
580+
secretName: ci-pull-credentials
581+
- name: manifest-tool-local-pusher
582+
secret:
583+
secretName: manifest-tool-local-pusher
584+
- name: pull-secret
585+
secret:
586+
secretName: registry-pull-credentials
587+
- name: result-aggregator
588+
secret:
589+
secretName: result-aggregator
590+
trigger: (?m)^/test( | .* )e2e-gcp-external-oidc,?($|\s.*)
366591
- agent: kubernetes
367592
always_run: false
368593
branches:

0 commit comments

Comments
 (0)