Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: e2e workaround #6158

Merged
merged 2 commits into from
May 2, 2024
Merged

chore: e2e workaround #6158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80957ba
chore: e2e workaround
ludamad May 2, 2024
a8017b0
Update Earthfile
ludamad May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
# prepare images locally, tagged by commit hash
- name: "Build E2E Image"
timeout-minutes: 40
run: earthly ./yarn-project+export-end-to-end
run: earthly ./yarn-project+export-e2e-test-images

# all the end-to-end integration tests for aztec
e2e:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
# prepare images locally, tagged by commit hash
- name: "Build E2E Image"
timeout-minutes: 40
run: earthly-ci ./yarn-project+export-end-to-end
run: earthly-ci ./yarn-project+export-e2e-test-images
# We base our e2e list used in e2e-x86 off the targets in ./yarn-project/end-to-end
# (Note ARM uses just 2 tests as a smoketest)
- name: Create list of end-to-end jobs
Expand Down
4 changes: 4 additions & 0 deletions yarn-project/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ export-end-to-end:
FROM +end-to-end
SAVE IMAGE aztecprotocol/end-to-end:$EARTHLY_GIT_HASH

export-e2e-test-images:
BUILD +export-aztec
BUILD +export-end-to-end

format-check:
FROM +build
RUN yarn formatting
Expand Down
12 changes: 6 additions & 6 deletions yarn-project/end-to-end/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ E2E_COMPOSE_TEST:
ELSE
LET CMD="docker-compose"
END
WITH DOCKER \
--load aztecprotocol/aztec:latest=../+aztec \
--load aztecprotocol/end-to-end:latest=../+end-to-end \
--load aztecprotocol/foundry-nightly-de33b6af53005037b463318d2628b5cfcaf3991:latest=../../build-images+build
# Run our docker compose, ending whenever sandbox ends, filtering out noisy eth_getLogs
RUN $CMD -p $project_name -f $compose_file up --exit-code-from=end-to-end --force-recreate
WAIT
BUILD ../+export-e2e-test-images
END
# Let docker compose know about the pushed tags above
ENV AZTEC_DOCKER_TAG=$(git rev-parse HEAD)
# Run our docker compose, ending whenever sandbox ends, filtering out noisy eth_getLogs
RUN $CMD -p $project_name -f $compose_file up --exit-code-from=end-to-end --force-recreate

UPLOAD_LOGS:
FUNCTION
Expand Down
Loading