diff --git a/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main.yaml b/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main.yaml index 8d0fbc4ff6747..dfbb9e4588345 100644 --- a/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main.yaml +++ b/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main.yaml @@ -164,6 +164,20 @@ tests: resources: requests: cpu: 100m +- as: tests-extension + steps: + test: + - as: tests-extension + commands: | + echo "Build binary olmv1-tests-ext" + cd openshift/tests-extension + make build + echo "Running olmv1-tests-ext with all tests" + ./bin/olmv1-tests-ext run-suite olmv1/all + from: src + resources: + requests: + cpu: 100m zz_generated_metadata: branch: main org: openshift diff --git a/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.20.yaml b/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.20.yaml index 584d9e0e139aa..a30053931682f 100644 --- a/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.20.yaml +++ b/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.20.yaml @@ -165,6 +165,20 @@ tests: resources: requests: cpu: 100m +- as: tests-extension + steps: + test: + - as: tests-extension + commands: | + echo "Build binary olmv1-tests-ext" + cd openshift/tests-extension + make build + echo "Running olmv1-tests-ext with all tests" + ./bin/olmv1-tests-ext run-suite olmv1/all + from: src + resources: + requests: + cpu: 100m zz_generated_metadata: branch: release-4.20 org: openshift diff --git a/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.21.yaml b/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.21.yaml index 177df8a5f75bd..dca802a07922a 100644 --- a/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.21.yaml +++ b/ci-operator/config/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.21.yaml @@ -164,6 +164,20 @@ tests: resources: requests: cpu: 100m +- as: tests-extension + steps: + test: + - as: tests-extension + commands: | + echo "Build binary olmv1-tests-ext" + cd openshift/tests-extension + make build + echo "Running olmv1-tests-ext with all tests" + ./bin/olmv1-tests-ext run-suite olmv1/all + from: src + resources: + requests: + cpu: 100m zz_generated_metadata: branch: release-4.21 org: openshift diff --git a/ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main-presubmits.yaml b/ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main-presubmits.yaml index 121224bbb54d2..9349903cb3490 100644 --- a/ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-main-presubmits.yaml @@ -452,6 +452,66 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )openshift-e2e-aws-techpreview,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build07 + context: ci/prow/tests-extension + decorate: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-operator-framework-operator-controller-main-tests-extension + rerun_command: /test tests-extension + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=tests-extension + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )tests-extension,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.20-presubmits.yaml index 77b85f78ae7ae..43e2c555de249 100644 --- a/ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.20-presubmits.yaml +++ b/ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.20-presubmits.yaml @@ -314,6 +314,66 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )openshift-e2e-aws-techpreview,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.20$ + - ^release-4\.20- + cluster: build06 + context: ci/prow/tests-extension + decorate: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-operator-framework-operator-controller-release-4.20-tests-extension + rerun_command: /test tests-extension + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=tests-extension + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )tests-extension,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.21-presubmits.yaml index d3b7ec3705223..921e900851045 100644 --- a/ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift/operator-framework-operator-controller/openshift-operator-framework-operator-controller-release-4.21-presubmits.yaml @@ -315,6 +315,66 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )openshift-e2e-aws-techpreview,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.21$ + - ^release-4\.21- + cluster: build07 + context: ci/prow/tests-extension + decorate: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-operator-framework-operator-controller-release-4.21-tests-extension + rerun_command: /test tests-extension + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=tests-extension + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )tests-extension,?($|\s.*) - agent: kubernetes always_run: true branches: