Skip to content

Commit e20d504

Browse files
JoelSpeedprb112
authored andcommitted
Split API verify targets (openshift#42691)
1 parent 8281698 commit e20d504

File tree

6 files changed

+159
-3
lines changed

6 files changed

+159
-3
lines changed

ci-operator/config/openshift/api/openshift-api-master.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@ tests:
2828
from: bin
2929
- as: verify
3030
commands: |
31-
make verify -k --warn-undefined-variables
31+
make verify-scripts verify-codegen-crds -k --warn-undefined-variables
32+
container:
33+
from: bin
34+
- as: verify-crd-schema
35+
commands: |
36+
make verify-crd-schema -k --warn-undefined-variables
3237
container:
3338
from: bin
3439
- as: verify-deps

ci-operator/config/openshift/api/openshift-api-release-4.14.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ tests:
2929
from: bin
3030
- as: verify
3131
commands: |
32-
make verify -k --warn-undefined-variables
32+
make verify-scripts verify-codegen-crds -k --warn-undefined-variables
33+
container:
34+
from: bin
35+
- as: verify-crd-schema
36+
commands: |
37+
make verify-crd-schema -k --warn-undefined-variables
3338
container:
3439
from: bin
3540
- as: verify-deps

ci-operator/config/openshift/api/openshift-api-release-4.15.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@ tests:
2828
from: bin
2929
- as: verify
3030
commands: |
31-
make verify -k --warn-undefined-variables
31+
make verify-scripts verify-codegen-crds -k --warn-undefined-variables
32+
container:
33+
from: bin
34+
- as: verify-crd-schema
35+
commands: |
36+
make verify-crd-schema -k --warn-undefined-variables
3237
container:
3338
from: bin
3439
- as: verify-deps

ci-operator/jobs/openshift/api/openshift-api-master-presubmits.yaml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,53 @@ presubmits:
235235
secret:
236236
secretName: result-aggregator
237237
trigger: (?m)^/test( | .* )verify-client-go,?($|\s.*)
238+
- agent: kubernetes
239+
always_run: true
240+
branches:
241+
- ^master$
242+
- ^master-
243+
cluster: build03
244+
context: ci/prow/verify-crd-schema
245+
decorate: true
246+
labels:
247+
ci.openshift.io/generator: prowgen
248+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
249+
name: pull-ci-openshift-api-master-verify-crd-schema
250+
rerun_command: /test verify-crd-schema
251+
spec:
252+
containers:
253+
- args:
254+
- --gcs-upload-secret=/secrets/gcs/service-account.json
255+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
256+
- --report-credentials-file=/etc/report/credentials
257+
- --target=verify-crd-schema
258+
command:
259+
- ci-operator
260+
image: ci-operator:latest
261+
imagePullPolicy: Always
262+
name: ""
263+
resources:
264+
requests:
265+
cpu: 10m
266+
volumeMounts:
267+
- mountPath: /secrets/gcs
268+
name: gcs-credentials
269+
readOnly: true
270+
- mountPath: /etc/pull-secret
271+
name: pull-secret
272+
readOnly: true
273+
- mountPath: /etc/report
274+
name: result-aggregator
275+
readOnly: true
276+
serviceAccountName: ci-operator
277+
volumes:
278+
- name: pull-secret
279+
secret:
280+
secretName: registry-pull-credentials
281+
- name: result-aggregator
282+
secret:
283+
secretName: result-aggregator
284+
trigger: (?m)^/test( | .* )verify-crd-schema,?($|\s.*)
238285
- agent: kubernetes
239286
always_run: true
240287
branches:

ci-operator/jobs/openshift/api/openshift-api-release-4.14-presubmits.yaml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,53 @@ presubmits:
235235
secret:
236236
secretName: result-aggregator
237237
trigger: (?m)^/test( | .* )verify-client-go,?($|\s.*)
238+
- agent: kubernetes
239+
always_run: true
240+
branches:
241+
- ^release-4\.14$
242+
- ^release-4\.14-
243+
cluster: build05
244+
context: ci/prow/verify-crd-schema
245+
decorate: true
246+
labels:
247+
ci.openshift.io/generator: prowgen
248+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
249+
name: pull-ci-openshift-api-release-4.14-verify-crd-schema
250+
rerun_command: /test verify-crd-schema
251+
spec:
252+
containers:
253+
- args:
254+
- --gcs-upload-secret=/secrets/gcs/service-account.json
255+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
256+
- --report-credentials-file=/etc/report/credentials
257+
- --target=verify-crd-schema
258+
command:
259+
- ci-operator
260+
image: ci-operator:latest
261+
imagePullPolicy: Always
262+
name: ""
263+
resources:
264+
requests:
265+
cpu: 10m
266+
volumeMounts:
267+
- mountPath: /secrets/gcs
268+
name: gcs-credentials
269+
readOnly: true
270+
- mountPath: /etc/pull-secret
271+
name: pull-secret
272+
readOnly: true
273+
- mountPath: /etc/report
274+
name: result-aggregator
275+
readOnly: true
276+
serviceAccountName: ci-operator
277+
volumes:
278+
- name: pull-secret
279+
secret:
280+
secretName: registry-pull-credentials
281+
- name: result-aggregator
282+
secret:
283+
secretName: result-aggregator
284+
trigger: (?m)^/test( | .* )verify-crd-schema,?($|\s.*)
238285
- agent: kubernetes
239286
always_run: true
240287
branches:

ci-operator/jobs/openshift/api/openshift-api-release-4.15-presubmits.yaml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,53 @@ presubmits:
235235
secret:
236236
secretName: result-aggregator
237237
trigger: (?m)^/test( | .* )verify-client-go,?($|\s.*)
238+
- agent: kubernetes
239+
always_run: true
240+
branches:
241+
- ^release-4\.15$
242+
- ^release-4\.15-
243+
cluster: build05
244+
context: ci/prow/verify-crd-schema
245+
decorate: true
246+
labels:
247+
ci.openshift.io/generator: prowgen
248+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
249+
name: pull-ci-openshift-api-release-4.15-verify-crd-schema
250+
rerun_command: /test verify-crd-schema
251+
spec:
252+
containers:
253+
- args:
254+
- --gcs-upload-secret=/secrets/gcs/service-account.json
255+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
256+
- --report-credentials-file=/etc/report/credentials
257+
- --target=verify-crd-schema
258+
command:
259+
- ci-operator
260+
image: ci-operator:latest
261+
imagePullPolicy: Always
262+
name: ""
263+
resources:
264+
requests:
265+
cpu: 10m
266+
volumeMounts:
267+
- mountPath: /secrets/gcs
268+
name: gcs-credentials
269+
readOnly: true
270+
- mountPath: /etc/pull-secret
271+
name: pull-secret
272+
readOnly: true
273+
- mountPath: /etc/report
274+
name: result-aggregator
275+
readOnly: true
276+
serviceAccountName: ci-operator
277+
volumes:
278+
- name: pull-secret
279+
secret:
280+
secretName: registry-pull-credentials
281+
- name: result-aggregator
282+
secret:
283+
secretName: result-aggregator
284+
trigger: (?m)^/test( | .* )verify-crd-schema,?($|\s.*)
238285
- agent: kubernetes
239286
always_run: true
240287
branches:

0 commit comments

Comments
 (0)