Skip to content

Commit 875537d

Browse files
wangke19wangke19
committed
Call OTE in the ci in order to ensure that the tests will be executed always
1 parent 74b943c commit 875537d

8 files changed

+300
-0
lines changed

‎ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-master.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,20 @@ tests:
8383
CHECK_MOD_LIST: "false"
8484
test:
8585
- ref: go-verify-deps
86+
- as: e2e-tests-extension
87+
optional: true
88+
steps:
89+
test:
90+
- as: tests-extension
91+
commands: |
92+
echo "Build binary oauth-apiserver-tests-ext"
93+
make tests-ext-build
94+
echo "Running ./oauth-apiserver-tests-ext with sanity test"
95+
./oauth-apiserver-tests-ext run-suite openshift/oauth-apiserver/conformance/parallel -j ${ARTIFACT_DIR}/junit_$(shell date +%Y%m%d-%H%M%S).xml
96+
from: src
97+
resources:
98+
requests:
99+
cpu: 100m
86100
zz_generated_metadata:
87101
branch: master
88102
org: openshift

‎ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.20.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,20 @@ tests:
8383
CHECK_MOD_LIST: "false"
8484
test:
8585
- ref: go-verify-deps
86+
- as: e2e-tests-extension
87+
optional: true
88+
steps:
89+
test:
90+
- as: tests-extension
91+
commands: |
92+
echo "Build binary oauth-apiserver-tests-ext"
93+
make tests-ext-build
94+
echo "Running ./oauth-apiserver-tests-ext with sanity test"
95+
./oauth-apiserver-tests-ext run-suite openshift/oauth-apiserver/conformance/parallel -j ${ARTIFACT_DIR}/junit_$(shell date +%Y%m%d-%H%M%S).xml
96+
from: src
97+
resources:
98+
requests:
99+
cpu: 100m
86100
zz_generated_metadata:
87101
branch: release-4.20
88102
org: openshift

‎ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.21.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,20 @@ tests:
8484
CHECK_MOD_LIST: "false"
8585
test:
8686
- ref: go-verify-deps
87+
- as: e2e-tests-extension
88+
optional: true
89+
steps:
90+
test:
91+
- as: tests-extension
92+
commands: |
93+
echo "Build binary oauth-apiserver-tests-ext"
94+
make tests-ext-build
95+
echo "Running ./oauth-apiserver-tests-ext with sanity test"
96+
./oauth-apiserver-tests-ext run-suite openshift/oauth-apiserver/conformance/parallel -j ${ARTIFACT_DIR}/junit_$(shell date +%Y%m%d-%H%M%S).xml
97+
from: src
98+
resources:
99+
requests:
100+
cpu: 100m
87101
zz_generated_metadata:
88102
branch: release-4.21
89103
org: openshift

‎ci-operator/config/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.22.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,20 @@ tests:
8383
CHECK_MOD_LIST: "false"
8484
test:
8585
- ref: go-verify-deps
86+
- as: e2e-tests-extension
87+
optional: true
88+
steps:
89+
test:
90+
- as: tests-extension
91+
commands: |
92+
echo "Build binary oauth-apiserver-tests-ext"
93+
make tests-ext-build
94+
echo "Running ./oauth-apiserver-tests-ext with sanity test"
95+
./oauth-apiserver-tests-ext run-suite openshift/oauth-apiserver/conformance/parallel -j ${ARTIFACT_DIR}/junit_$(shell date +%Y%m%d-%H%M%S).xml
96+
from: src
97+
resources:
98+
requests:
99+
cpu: 100m
86100
zz_generated_metadata:
87101
branch: release-4.22
88102
org: openshift

‎ci-operator/jobs/openshift/oauth-apiserver/openshift-oauth-apiserver-master-presubmits.yaml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,67 @@ presubmits:
290290
secret:
291291
secretName: result-aggregator
292292
trigger: (?m)^/test( | .* )e2e-component,?($|\s.*)
293+
- agent: kubernetes
294+
always_run: true
295+
branches:
296+
- ^master$
297+
- ^master-
298+
cluster: build07
299+
context: ci/prow/e2e-tests-extension
300+
decorate: true
301+
labels:
302+
ci.openshift.io/generator: prowgen
303+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
304+
name: pull-ci-openshift-oauth-apiserver-master-e2e-tests-extension
305+
optional: true
306+
rerun_command: /test e2e-tests-extension
307+
spec:
308+
containers:
309+
- args:
310+
- --gcs-upload-secret=/secrets/gcs/service-account.json
311+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
312+
- --report-credentials-file=/etc/report/credentials
313+
- --secret-dir=/secrets/ci-pull-credentials
314+
- --target=e2e-tests-extension
315+
command:
316+
- ci-operator
317+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
318+
imagePullPolicy: Always
319+
name: ""
320+
resources:
321+
requests:
322+
cpu: 10m
323+
volumeMounts:
324+
- mountPath: /secrets/ci-pull-credentials
325+
name: ci-pull-credentials
326+
readOnly: true
327+
- mountPath: /secrets/gcs
328+
name: gcs-credentials
329+
readOnly: true
330+
- mountPath: /secrets/manifest-tool
331+
name: manifest-tool-local-pusher
332+
readOnly: true
333+
- mountPath: /etc/pull-secret
334+
name: pull-secret
335+
readOnly: true
336+
- mountPath: /etc/report
337+
name: result-aggregator
338+
readOnly: true
339+
serviceAccountName: ci-operator
340+
volumes:
341+
- name: ci-pull-credentials
342+
secret:
343+
secretName: ci-pull-credentials
344+
- name: manifest-tool-local-pusher
345+
secret:
346+
secretName: manifest-tool-local-pusher
347+
- name: pull-secret
348+
secret:
349+
secretName: registry-pull-credentials
350+
- name: result-aggregator
351+
secret:
352+
secretName: result-aggregator
353+
trigger: (?m)^/test( | .* )e2e-tests-extension,?($|\s.*)
293354
- agent: kubernetes
294355
always_run: true
295356
branches:

‎ci-operator/jobs/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.20-presubmits.yaml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,67 @@ presubmits:
290290
secret:
291291
secretName: result-aggregator
292292
trigger: (?m)^/test( | .* )e2e-component,?($|\s.*)
293+
- agent: kubernetes
294+
always_run: true
295+
branches:
296+
- ^release-4\.20$
297+
- ^release-4\.20-
298+
cluster: build07
299+
context: ci/prow/e2e-tests-extension
300+
decorate: true
301+
labels:
302+
ci.openshift.io/generator: prowgen
303+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
304+
name: pull-ci-openshift-oauth-apiserver-release-4.20-e2e-tests-extension
305+
optional: true
306+
rerun_command: /test e2e-tests-extension
307+
spec:
308+
containers:
309+
- args:
310+
- --gcs-upload-secret=/secrets/gcs/service-account.json
311+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
312+
- --report-credentials-file=/etc/report/credentials
313+
- --secret-dir=/secrets/ci-pull-credentials
314+
- --target=e2e-tests-extension
315+
command:
316+
- ci-operator
317+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
318+
imagePullPolicy: Always
319+
name: ""
320+
resources:
321+
requests:
322+
cpu: 10m
323+
volumeMounts:
324+
- mountPath: /secrets/ci-pull-credentials
325+
name: ci-pull-credentials
326+
readOnly: true
327+
- mountPath: /secrets/gcs
328+
name: gcs-credentials
329+
readOnly: true
330+
- mountPath: /secrets/manifest-tool
331+
name: manifest-tool-local-pusher
332+
readOnly: true
333+
- mountPath: /etc/pull-secret
334+
name: pull-secret
335+
readOnly: true
336+
- mountPath: /etc/report
337+
name: result-aggregator
338+
readOnly: true
339+
serviceAccountName: ci-operator
340+
volumes:
341+
- name: ci-pull-credentials
342+
secret:
343+
secretName: ci-pull-credentials
344+
- name: manifest-tool-local-pusher
345+
secret:
346+
secretName: manifest-tool-local-pusher
347+
- name: pull-secret
348+
secret:
349+
secretName: registry-pull-credentials
350+
- name: result-aggregator
351+
secret:
352+
secretName: result-aggregator
353+
trigger: (?m)^/test( | .* )e2e-tests-extension,?($|\s.*)
293354
- agent: kubernetes
294355
always_run: true
295356
branches:

‎ci-operator/jobs/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.21-presubmits.yaml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,67 @@ presubmits:
290290
secret:
291291
secretName: result-aggregator
292292
trigger: (?m)^/test( | .* )e2e-component,?($|\s.*)
293+
- agent: kubernetes
294+
always_run: true
295+
branches:
296+
- ^release-4\.21$
297+
- ^release-4\.21-
298+
cluster: build07
299+
context: ci/prow/e2e-tests-extension
300+
decorate: true
301+
labels:
302+
ci.openshift.io/generator: prowgen
303+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
304+
name: pull-ci-openshift-oauth-apiserver-release-4.21-e2e-tests-extension
305+
optional: true
306+
rerun_command: /test e2e-tests-extension
307+
spec:
308+
containers:
309+
- args:
310+
- --gcs-upload-secret=/secrets/gcs/service-account.json
311+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
312+
- --report-credentials-file=/etc/report/credentials
313+
- --secret-dir=/secrets/ci-pull-credentials
314+
- --target=e2e-tests-extension
315+
command:
316+
- ci-operator
317+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
318+
imagePullPolicy: Always
319+
name: ""
320+
resources:
321+
requests:
322+
cpu: 10m
323+
volumeMounts:
324+
- mountPath: /secrets/ci-pull-credentials
325+
name: ci-pull-credentials
326+
readOnly: true
327+
- mountPath: /secrets/gcs
328+
name: gcs-credentials
329+
readOnly: true
330+
- mountPath: /secrets/manifest-tool
331+
name: manifest-tool-local-pusher
332+
readOnly: true
333+
- mountPath: /etc/pull-secret
334+
name: pull-secret
335+
readOnly: true
336+
- mountPath: /etc/report
337+
name: result-aggregator
338+
readOnly: true
339+
serviceAccountName: ci-operator
340+
volumes:
341+
- name: ci-pull-credentials
342+
secret:
343+
secretName: ci-pull-credentials
344+
- name: manifest-tool-local-pusher
345+
secret:
346+
secretName: manifest-tool-local-pusher
347+
- name: pull-secret
348+
secret:
349+
secretName: registry-pull-credentials
350+
- name: result-aggregator
351+
secret:
352+
secretName: result-aggregator
353+
trigger: (?m)^/test( | .* )e2e-tests-extension,?($|\s.*)
293354
- agent: kubernetes
294355
always_run: true
295356
branches:

‎ci-operator/jobs/openshift/oauth-apiserver/openshift-oauth-apiserver-release-4.22-presubmits.yaml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,67 @@ presubmits:
290290
secret:
291291
secretName: result-aggregator
292292
trigger: (?m)^/test( | .* )e2e-component,?($|\s.*)
293+
- agent: kubernetes
294+
always_run: true
295+
branches:
296+
- ^release-4\.22$
297+
- ^release-4\.22-
298+
cluster: build02
299+
context: ci/prow/e2e-tests-extension
300+
decorate: true
301+
labels:
302+
ci.openshift.io/generator: prowgen
303+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
304+
name: pull-ci-openshift-oauth-apiserver-release-4.22-e2e-tests-extension
305+
optional: true
306+
rerun_command: /test e2e-tests-extension
307+
spec:
308+
containers:
309+
- args:
310+
- --gcs-upload-secret=/secrets/gcs/service-account.json
311+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
312+
- --report-credentials-file=/etc/report/credentials
313+
- --secret-dir=/secrets/ci-pull-credentials
314+
- --target=e2e-tests-extension
315+
command:
316+
- ci-operator
317+
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
318+
imagePullPolicy: Always
319+
name: ""
320+
resources:
321+
requests:
322+
cpu: 10m
323+
volumeMounts:
324+
- mountPath: /secrets/ci-pull-credentials
325+
name: ci-pull-credentials
326+
readOnly: true
327+
- mountPath: /secrets/gcs
328+
name: gcs-credentials
329+
readOnly: true
330+
- mountPath: /secrets/manifest-tool
331+
name: manifest-tool-local-pusher
332+
readOnly: true
333+
- mountPath: /etc/pull-secret
334+
name: pull-secret
335+
readOnly: true
336+
- mountPath: /etc/report
337+
name: result-aggregator
338+
readOnly: true
339+
serviceAccountName: ci-operator
340+
volumes:
341+
- name: ci-pull-credentials
342+
secret:
343+
secretName: ci-pull-credentials
344+
- name: manifest-tool-local-pusher
345+
secret:
346+
secretName: manifest-tool-local-pusher
347+
- name: pull-secret
348+
secret:
349+
secretName: registry-pull-credentials
350+
- name: result-aggregator
351+
secret:
352+
secretName: result-aggregator
353+
trigger: (?m)^/test( | .* )e2e-tests-extension,?($|\s.*)
293354
- agent: kubernetes
294355
always_run: true
295356
branches:

0 commit comments

Comments
 (0)