diff --git a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml index 547152a1d2b84..688d1c007679f 100644 --- a/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml +++ b/ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml @@ -3,6 +3,14 @@ base_images: name: "4.10" namespace: ocp tag: base + cincinnati_operand_latest: + name: cincinnati-build-root + namespace: cincinnati-ci + tag: deploy + graphdata: + name: cincinnati-graph-data + namespace: cincinnati-ci-public + tag: stable build_root: image_stream_tag: name: release @@ -49,9 +57,9 @@ tests: - as: e2e-test cli: initial commands: | + make func-test \ + RELATED_IMAGE_OPERAND=quay.io/app-sre/cincinnati@sha256:921b7a2e579d4cfe0e58ecf3abcc2262b321b6d0f8be7f6ebcb700acfca5ba55 \ OPENSHIFT_BUILD_NAMESPACE= - RELATED_IMAGE_OPERAND=quay.io/app-sre/cincinnati@sha256:921b7a2e579d4cfe0e58ecf3abcc2262b321b6d0f8be7f6ebcb700acfca5ba55 - make func-test dependencies: - env: OPERATOR_IMAGE name: stable:cincinnati-operator @@ -65,6 +73,28 @@ tests: cpu: 100m memory: 200Mi workflow: openshift-e2e-gcp +- as: operator-e2e-latest-osus + steps: + cluster_profile: gcp + test: + - as: e2e-test + cli: initial + commands: make func-test OPENSHIFT_BUILD_NAMESPACE= + dependencies: + - env: OPERATOR_IMAGE + name: stable:cincinnati-operator + - env: RELATED_IMAGE_OPERATOR + name: stable:cincinnati-operator + - env: GRAPH_DATA_IMAGE + name: graphdata + - env: RELATED_IMAGE_OPERAND + name: cincinnati_operand_latest + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + workflow: openshift-e2e-gcp zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-master-presubmits.yaml index 2d111bde2bdd9..05c7f52e84b8d 100644 --- a/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-master-presubmits.yaml @@ -128,6 +128,84 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )operator-e2e,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build02 + context: ci/prow/operator-e2e-latest-osus + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: gcp + ci-operator.openshift.io/cloud-cluster-profile: gcp + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cincinnati-operator-master-operator-e2e-latest-osus + rerun_command: /test operator-e2e-latest-osus + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --lease-server-credentials-file=/etc/boskos/credentials + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --secret-dir=/usr/local/operator-e2e-latest-osus-cluster-profile + - --target=operator-e2e-latest-osus + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /usr/local/operator-e2e-latest-osus-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )operator-e2e-latest-osus,?($|\s.*) - agent: kubernetes always_run: true branches: