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

Jump to bottom

fix: run e2e tests without spot #2081

Merged
merged 9 commits into from
Sep 6, 2023
Merged

fix: run e2e tests without spot #2081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
975e879
fix: run e2e tests without spot
ludamad Sep 6, 2023
b1ca943
Run end-to-end
ludamad Sep 6, 2023
ceabab0
Add missing working dir
ludamad Sep 6, 2023
132da1a
Add missing working dir
ludamad Sep 6, 2023
8e7ce45
Add correct build image
ludamad Sep 6, 2023
f382f9a
Add correct build path
ludamad Sep 6, 2023
302fc36
e2e-canary-test
ludamad Sep 6, 2023
5db12cb
Revert store_test_benchmark_logs
ludamad Sep 6, 2023
9c301a3
fix e2e-escrow
ludamad Sep 6, 2023
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
70 changes: 35 additions & 35 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,26 +725,26 @@ jobs:
working_directory: yarn-project/end-to-end

e2e-sandbox-example:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
machine:
image: ubuntu-2004:202010-01
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_tests end-to-end e2e_sandbox_example.test.ts docker-compose-e2e-sandbox.yml
command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_sandbox_example.test.ts ./scripts/docker-compose-e2e-sandbox.yml
working_directory: yarn-project/end-to-end

e2e-multi-transfer-contract:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
machine:
image: ubuntu-2004:202010-01
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_tests end-to-end e2e_multi_transfer.test.ts
command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_multi_transfer.test.ts
working_directory: yarn-project/end-to-end

e2e-block-building:
machine:
Expand Down Expand Up @@ -831,15 +831,15 @@ jobs:
working_directory: yarn-project/end-to-end

e2e-escrow-contract:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
machine:
image: ubuntu-2004:202010-01
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_tests end-to-end e2e_escrow_contract.test.ts
command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_escrow_contract.test.ts
working_directory: yarn-project/end-to-end

e2e-pending-commitments-contract:
machine:
Expand Down Expand Up @@ -926,37 +926,37 @@ jobs:
working_directory: yarn-project/end-to-end

e2e-p2p:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
machine:
image: ubuntu-2004:202010-01
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_tests end-to-end e2e_p2p_network.test.ts
command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_p2p_network.test.ts
working_directory: yarn-project/end-to-end

e2e-browser-sandbox:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
machine:
image: ubuntu-2004:202010-01
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_tests end-to-end e2e_aztec_js_browser.test.ts docker-compose-e2e-sandbox.yml
command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_aztec_js_browser.test.ts ./scripts/docker-compose-e2e-sandbox.yml
working_directory: yarn-project/end-to-end

aztec-rpc-sandbox:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
machine:
image: ubuntu-2004:202010-01
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_tests end-to-end aztec_rpc_sandbox.test.ts docker-compose-e2e-sandbox.yml
command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local aztec_rpc_sandbox.test.ts ./scripts/docker-compose-e2e-sandbox.yml
working_directory: yarn-project/end-to-end

guides-writing-an-account-contract:
machine:
Expand All @@ -971,26 +971,26 @@ jobs:
working_directory: yarn-project/end-to-end

guides-dapp-testing:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
machine:
image: ubuntu-2004:202010-01
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_tests end-to-end guides/dapp_testing.test.ts docker-compose-e2e-sandbox.yml
command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local guides/dapp_testing.test.ts ./scripts/docker-compose-e2e-sandbox.yml
working_directory: yarn-project/end-to-end

e2e-canary-test:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
machine:
image: ubuntu-2004:202010-01
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_test_script ./scripts/run_tests canary-build uniswap_trade_on_l1_from_l2.test.ts canary-build docker-compose-e2e-sandbox.yml
command: ./scripts/cond_run_script canary-build $JOB_NAME ./scripts/run_tests_local uniswap_trade_on_l1_from_l2.test.ts canary-build ./scripts/docker-compose-e2e-sandbox.yml
working_directory: yarn-project/end-to-end

build-docs:
machine:
Expand Down Expand Up @@ -1191,7 +1191,7 @@ jobs:
- *setup_env
- run:
name: "Test"
command: spot_run_test_script ./scripts/run_tests canary uniswap_trade_on_l1_from_l2.test.ts canary docker-compose.yml
command: spot_run_test_script ./scripts/run_tests canary uniswap_trade_on_l1_from_l2.test.ts canary ./scripts/docker-compose.yml

run-deployment-canary-browser:
docker:
Expand All @@ -1202,7 +1202,7 @@ jobs:
- *setup_env
- run:
name: "Test"
command: spot_run_test_script ./scripts/run_tests canary aztec_js_browser.test.ts canary docker-compose.yml
command: spot_run_test_script ./scripts/run_tests canary aztec_js_browser.test.ts canary ./scripts/docker-compose.yml

run-deployment-canary-cli:
docker:
Expand All @@ -1213,7 +1213,7 @@ jobs:
- *setup_env
- run:
name: "Test"
command: spot_run_test_script ./scripts/run_tests canary cli.test.ts canary docker-compose.yml
command: spot_run_test_script ./scripts/run_tests canary cli.test.ts canary ./scripts/docker-compose.yml

# Repeatable config for defining the workflow below.
tag_regex: &tag_regex /^v.*/
Expand Down
8 changes: 4 additions & 4 deletions scripts/ci/store_test_benchmark_logs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -eu
set -e

AZTEC_GITHUB_TOKEN=$1

Expand Down Expand Up @@ -33,11 +33,11 @@ cat /tmp/csv/new.csv \
if [ -s /tmp/csv/trimmed.csv ]; then
cd /tmp

git clone --depth 1 git@github.com:AztecProtocol/benchmark-archive.git
git clone --depth 1 https://$AZTEC_GITHUB_TOKEN:@github.com/AztecProtocol/benchmark-archive

cd benchmark-archive
git config user.email "circleci@bot"
git config user.name "CircleCi Bot"
git config --global user.name AztecBot
git config --global user.email tech@aztecprotocol.com
cat /tmp/csv/trimmed.csv >>benchmarks.csv
git add benchmarks.csv
git commit -m "Added information from branch $BRANCH commit $COMMIT_HASH"
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/end-to-end/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# End to End

This package includes end-to-end tests that cover Aztec's main milestones.
These can be run locally either by starting anvil on a different terminal
These can be run locally either by starting anvil on a different terminal.

```
anvil -p 8545 --host 0.0.0.0 --chain-id 31337
Expand Down