Skip to content

Commit fe2914e

Browse files
[operator-controller]: Call OTE in the ci in order to ensure that the tests will be executed always
1 parent b3433ba commit fe2914e

File tree

4 files changed

+148
-0
lines changed

4 files changed

+148
-0
lines changed

ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,20 @@ tests:
155155
resources:
156156
requests:
157157
cpu: 100m
158+
- as: tests-extension
159+
steps:
160+
test:
161+
- as: tests-extension
162+
commands: |
163+
echo "Build binary olmv1-tests-ext"
164+
cd openshift/tests-extension
165+
make build
166+
echo "Running olmv1-tests-ext with all tests"
167+
./bin/olmv1-tests-ext run-suite olmv1/all
168+
from: src
169+
resources:
170+
requests:
171+
cpu: 100m
158172
zz_generated_metadata:
159173
branch: main
160174
org: openshift

ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.21.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,20 @@ tests:
155155
resources:
156156
requests:
157157
cpu: 100m
158+
- as: tests-extension
159+
steps:
160+
test:
161+
- as: tests-extension
162+
commands: |
163+
echo "Build binary olmv1-tests-ext"
164+
cd openshift/tests-extension
165+
make build
166+
echo "Running olmv1-tests-ext with all tests"
167+
./bin/olmv1-tests-ext run-suite olmv1/all
168+
from: src
169+
resources:
170+
requests:
171+
cpu: 100m
158172
zz_generated_metadata:
159173
branch: release-4.21
160174
org: openshift

ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main-presubmits.yaml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,66 @@ presubmits:
452452
secret:
453453
secretName: result-aggregator
454454
trigger: (?m)^/test( | .* )openshift-e2e-aws-techpreview,?($|\s.*)
455+
- agent: kubernetes
456+
always_run: true
457+
branches:
458+
- ^main$
459+
- ^main-
460+
cluster: build07
461+
context: ci/prow/tests-extension
462+
decorate: true
463+
labels:
464+
ci.openshift.io/generator: prowgen
465+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
466+
name: pull-ci-openshift-operator-framework-operator-controller-main-tests-extension
467+
rerun_command: /test tests-extension
468+
spec:
469+
containers:
470+
- args:
471+
- --gcs-upload-secret=/secrets/gcs/service-account.json
472+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
473+
- --report-credentials-file=/etc/report/credentials
474+
- --secret-dir=/secrets/ci-pull-credentials
475+
- --target=tests-extension
476+
command:
477+
- ci-operator
478+
image: ci-operator:latest
479+
imagePullPolicy: Always
480+
name: ""
481+
resources:
482+
requests:
483+
cpu: 10m
484+
volumeMounts:
485+
- mountPath: /secrets/ci-pull-credentials
486+
name: ci-pull-credentials
487+
readOnly: true
488+
- mountPath: /secrets/gcs
489+
name: gcs-credentials
490+
readOnly: true
491+
- mountPath: /secrets/manifest-tool
492+
name: manifest-tool-local-pusher
493+
readOnly: true
494+
- mountPath: /etc/pull-secret
495+
name: pull-secret
496+
readOnly: true
497+
- mountPath: /etc/report
498+
name: result-aggregator
499+
readOnly: true
500+
serviceAccountName: ci-operator
501+
volumes:
502+
- name: ci-pull-credentials
503+
secret:
504+
secretName: ci-pull-credentials
505+
- name: manifest-tool-local-pusher
506+
secret:
507+
secretName: manifest-tool-local-pusher
508+
- name: pull-secret
509+
secret:
510+
secretName: registry-pull-credentials
511+
- name: result-aggregator
512+
secret:
513+
secretName: result-aggregator
514+
trigger: (?m)^/test( | .* )tests-extension,?($|\s.*)
455515
- agent: kubernetes
456516
always_run: true
457517
branches:

ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.21-presubmits.yaml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,66 @@ presubmits:
315315
secret:
316316
secretName: result-aggregator
317317
trigger: (?m)^/test( | .* )openshift-e2e-aws-techpreview,?($|\s.*)
318+
- agent: kubernetes
319+
always_run: true
320+
branches:
321+
- ^release-4\.21$
322+
- ^release-4\.21-
323+
cluster: build07
324+
context: ci/prow/tests-extension
325+
decorate: true
326+
labels:
327+
ci.openshift.io/generator: prowgen
328+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
329+
name: pull-ci-openshift-operator-framework-operator-controller-release-4.21-tests-extension
330+
rerun_command: /test tests-extension
331+
spec:
332+
containers:
333+
- args:
334+
- --gcs-upload-secret=/secrets/gcs/service-account.json
335+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
336+
- --report-credentials-file=/etc/report/credentials
337+
- --secret-dir=/secrets/ci-pull-credentials
338+
- --target=tests-extension
339+
command:
340+
- ci-operator
341+
image: ci-operator:latest
342+
imagePullPolicy: Always
343+
name: ""
344+
resources:
345+
requests:
346+
cpu: 10m
347+
volumeMounts:
348+
- mountPath: /secrets/ci-pull-credentials
349+
name: ci-pull-credentials
350+
readOnly: true
351+
- mountPath: /secrets/gcs
352+
name: gcs-credentials
353+
readOnly: true
354+
- mountPath: /secrets/manifest-tool
355+
name: manifest-tool-local-pusher
356+
readOnly: true
357+
- mountPath: /etc/pull-secret
358+
name: pull-secret
359+
readOnly: true
360+
- mountPath: /etc/report
361+
name: result-aggregator
362+
readOnly: true
363+
serviceAccountName: ci-operator
364+
volumes:
365+
- name: ci-pull-credentials
366+
secret:
367+
secretName: ci-pull-credentials
368+
- name: manifest-tool-local-pusher
369+
secret:
370+
secretName: manifest-tool-local-pusher
371+
- name: pull-secret
372+
secret:
373+
secretName: registry-pull-credentials
374+
- name: result-aggregator
375+
secret:
376+
secretName: result-aggregator
377+
trigger: (?m)^/test( | .* )tests-extension,?($|\s.*)
318378
- agent: kubernetes
319379
always_run: true
320380
branches:

0 commit comments

Comments
 (0)