Skip to content

Commit 3f4d89b

Browse files
committed
create tasks
1 parent 677bc49 commit 3f4d89b

File tree

4 files changed

+20
-61
lines changed

4 files changed

+20
-61
lines changed

.evergreen/buildvariants-and-tasks.in.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,12 @@ buildvariants:
259259
- name: e2e-coverage-<%= group.number %>
260260
<% } %>
261261

262+
- name: publish-e2e-tests
263+
display_name: Publish E2E Tests Docker Image
264+
run_on: ubuntu2004-large
265+
tasks:
266+
- name: publish-e2e-tests
267+
262268
- name: csfle-tests
263269
display_name: CSFLE Tests
264270
run_on: ubuntu2004-large
@@ -528,3 +534,9 @@ for (const compassDistribution of COMPASS_DISTRIBUTIONS) {
528534
- func: create_static_analysis_report
529535
vars:
530536
first_party_dependency_filenames: <%= firstPartyDepsFilenames.map(f => '.sbom/' + f).join(',') %>
537+
538+
- name: publish-e2e-tests
539+
tags: ['run-on-pr']
540+
commands:
541+
- func: clone
542+
- func: package-and-publish-e2e-docker-image

.evergreen/functions.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -132,26 +132,19 @@ post:
132132
params:
133133
file: src/.logs/*.xml
134134
functions:
135-
build-e2e-docker-image:
135+
package-and-publish-e2e-docker-image:
136136
command: shell.exec
137-
type: setup
138137
params:
139138
shell: bash
140-
working_dir: mms
141-
include_expansions_in_env: [BAZELISK_HOME, AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, AWS_SESSION_TOKEN]
142139
env:
143-
XDG_RUNTIME_DIR: ${workdir}/docker/run
144-
DOCKER_CONFIG: ${workdir}/mms/.docker/mms
140+
<<: *compass-env
141+
AWS_ACCESS_KEY_ID: ${aws_key}
142+
AWS_SECRET_ACCESS_KEY: ${aws_secret}
143+
ECR_REGISTRY: ${ecr_registry}
144+
include_expansions_in_env: [github_commit, ECR_REGION]
145145
script: |
146-
set -exu
147-
export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock"
148-
PATH="${workdir}/bin:$PATH" bazel build ${bazel_args} ${bazel_target}
149-
150-
package-and-publish-e2e-docker-image:
151-
- *skip-if-patch-build
152-
- *build-e2e-docker-image
153-
- *check-if-e2e-docker-image-is-already-published
154-
- *publish-e2e-docker-image
146+
set -e
147+
bash .evergreen/e2e-tests/package-and-publish-docker-image.sh
155148
156149
clone:
157150
- command: git.get_project

.evergreen/package-and-publish-e2e-docker-image/Dockerfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

.evergreen/package-and-publish-e2e-docker-image/build-e2e-docker-image.sh

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)