diff --git a/ci-operator/config/openshift-eng/openshift-logging-e2e-tests/openshift-eng-openshift-logging-e2e-tests-main.yaml b/ci-operator/config/openshift-eng/openshift-logging-e2e-tests/openshift-eng-openshift-logging-e2e-tests-main.yaml index 7a6626d31abc9..6ce067022c431 100644 --- a/ci-operator/config/openshift-eng/openshift-logging-e2e-tests/openshift-eng-openshift-logging-e2e-tests-main.yaml +++ b/ci-operator/config/openshift-eng/openshift-logging-e2e-tests/openshift-eng-openshift-logging-e2e-tests-main.yaml @@ -7,12 +7,15 @@ images: items: - dockerfile_literal: | FROM pipeline:src - RUN GONOSUMDB="*" GOFLAGS="" go mod download && \ - GONOSUMDB="*" GOFLAGS="" go install github.com/go-bindata/go-bindata/v3/go-bindata@latest && \ - mkdir -p "$(go env GOCACHE)" "$(go env GOMODCACHE)" && \ - chmod -R a+rwX "$(go env GOCACHE)" "$(go env GOMODCACHE)" + RUN GONOSUMDB="*" GOFLAGS="" go install github.com/go-bindata/go-bindata/v3/go-bindata@latest && \ + make build && \ + install -m 0755 bin/openshift-logging-e2e-tests-tests-ext /usr/local/bin/openshift-logging-e2e-tests-tests-ext from: src - to: src-with-deps + to: openshift-logging-e2e-tests +promotion: + to: + - namespace: logging + tag: main prowgen: enable_secrets_store_csi_driver: true resources: @@ -20,13 +23,6 @@ resources: requests: cpu: 100m memory: 200Mi -tests: -- as: build - commands: HOME=/tmp make build - container: - clone: true - from: src-with-deps - skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$ zz_generated_metadata: branch: main org: openshift-eng diff --git a/ci-operator/jobs/openshift-eng/openshift-logging-e2e-tests/openshift-eng-openshift-logging-e2e-tests-main-postsubmits.yaml b/ci-operator/jobs/openshift-eng/openshift-logging-e2e-tests/openshift-eng-openshift-logging-e2e-tests-main-postsubmits.yaml new file mode 100644 index 0000000000000..f999020c38c26 --- /dev/null +++ b/ci-operator/jobs/openshift-eng/openshift-logging-e2e-tests/openshift-eng-openshift-logging-e2e-tests-main-postsubmits.yaml @@ -0,0 +1,62 @@ +postsubmits: + openshift-eng/openshift-logging-e2e-tests: + - agent: kubernetes + always_run: true + branches: + - ^main$ + cluster: build01 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/is-promotion: "true" + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-openshift-eng-openshift-logging-e2e-tests-main-images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson + - --promote + - --report-credentials-file=/etc/report/credentials + - --target=[images] + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - 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/push-secret + name: push-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: push-secret + secret: + secretName: registry-push-credentials-ci-central + - name: result-aggregator + secret: + secretName: result-aggregator diff --git a/ci-operator/jobs/openshift-eng/openshift-logging-e2e-tests/openshift-eng-openshift-logging-e2e-tests-main-presubmits.yaml b/ci-operator/jobs/openshift-eng/openshift-logging-e2e-tests/openshift-eng-openshift-logging-e2e-tests-main-presubmits.yaml index 5f643d7acd3d3..aa5fee6ce0266 100644 --- a/ci-operator/jobs/openshift-eng/openshift-logging-e2e-tests/openshift-eng-openshift-logging-e2e-tests-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-eng/openshift-logging-e2e-tests/openshift-eng-openshift-logging-e2e-tests-main-presubmits.yaml @@ -1,69 +1,5 @@ presubmits: openshift-eng/openshift-logging-e2e-tests: - - agent: kubernetes - always_run: false - branches: - - ^main$ - - ^main- - cluster: build01 - context: ci/prow/build - decorate: true - decoration_config: - skip_cloning: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-eng-openshift-logging-e2e-tests-main-build - rerun_command: /test build - skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|OWNERS_ALIASES|PROJECT|LICENSE)$ - 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 - - --target=build - command: - - ci-operator - env: - - name: HTTP_SERVER_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest - imagePullPolicy: Always - name: "" - ports: - - containerPort: 8080 - name: http - resources: - requests: - cpu: 10m - volumeMounts: - - 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: 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( | .* )build,?($|\s.*) - agent: kubernetes always_run: true branches: