vacp2p/linea-monorepo
1
0
Fork 0
mirror of https://github.com/vacp2p/linea-monorepo.git synced 2026-01-09 04:08:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make minor fixes (#639)

Browse Source 
* e2e: small fixes on CI stack spinup

* make: make task resilient to missing folders

* make: minor fixes
This commit is contained in:
Pedro Novais
2025-01-30 17:05:23 +00:00
committed by GitHub
parent a63965e32c
commit 253a51a44f
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
.github/workflows/reuse-run-e2e-tests.yml vendored
View File

@@ -134,7 +134,7 @@ jobs:
retry_wait_seconds: 30
timeout_minutes: 10
command: |
make start-env-with-tracing-v1-ci
make start-env-with-tracing-v1-ci CLEAN_PREVIOUS_ENV=false
on_retry_command: |
make clean-environment
- name: Spin up fresh environment with besu tracing with retry
@@ -146,7 +146,7 @@ jobs:
retry_wait_seconds: 30
timeout_minutes: 10
command: |
make start-env-with-tracing-v2-ci
make start-env-with-tracing-v2-ci CLEAN_PREVIOUS_ENV=false
on_retry_command: |
make clean-environment
- name: List docker containers/images
@@ -168,20 +168,20 @@ jobs:
if: ${{ failure() && inputs.e2e-tests-logs-dump }}
run: |
mkdir -p docker_logs
find tmp/local/ >> docker_logs/files_in_shared_dir.txt
docker ps -a >> docker_logs/docker_ps.txt
docker logs coordinator --since 1h &>> docker_logs/coordinator.txt
find tmp/local/ >> docker_logs/files_in_shared_dir.txt || true
docker ps -a >> docker_logs/docker_ps.txt || true
docker logs coordinator --since 1h &>> docker_logs/coordinator.txt || true
docker logs prover --since 1h &>> docker_logs/prover.txt || true
docker logs prover-v3 --since 1h &>> docker_logs/prover-v3.txt; || true
docker logs shomei --since 1h &>> docker_logs/shomei.txt
docker logs zkbesu-shomei --since 1h &>> docker_logs/zkbesu-shomei.txt
docker logs shomei-frontend --since 1h &>> docker_logs/shomei-frontend.txt
docker logs postman --since 1h &>> docker_logs/postman.txt
docker logs traces-node --since 1h &>> docker_logs/traces-node.txt || true
docker logs shomei --since 1h &>> docker_logs/shomei.txt || true
docker logs zkbesu-shomei --since 1h &>> docker_logs/zkbesu-shomei.txt || true
docker logs shomei-frontend --since 1h &>> docker_logs/shomei-frontend.txt || true
docker logs postman --since 1h &>> docker_logs/postman.txt || true
docker logs traces-node --since 1h &>> docker_logs/traces-node.txt || true || true
docker logs traces-node-v2 --since 1h &>> docker_logs/traces-node-v2.txt; || true
docker logs l2-node-besu --since 1h &>> docker_logs/l2-node-besu.txt;
docker logs transaction-exclusion-api --since 1h &>> docker_logs/transaction-exclusion-api.txt
docker logs sequencer --since 1h &>> docker_logs/sequencer.txt
docker logs l2-node-besu --since 1h &>> docker_logs/l2-node-besu.txt; || true
docker logs transaction-exclusion-api --since 1h &>> docker_logs/transaction-exclusion-api.txt || true
docker logs sequencer --since 1h &>> docker_logs/sequencer.txt || true
- name: Archive debug logs
uses: actions/upload-artifact@v4
if: ${{ failure() && inputs.e2e-tests-logs-dump }}

19
Makefile
View File

@@ -16,18 +16,18 @@ docker-pull-images-external-to-monorepo:
clean-local-folders:
make clean-smc-folders
rm -rf tmp/local/*
rm -rf tmp/local/* || true # ignore failure if folders do not exist already
clean-testnet-folders:
make clean-smc-folders
rm -rf tmp/testnet/*
rm -rf tmp/testnet/* || true # ignore failure if folders do not exist already
clean-environment:
docker compose -f docker/compose-tracing-v1-ci-extension.yml -f docker/compose-tracing-v2-ci-extension.yml --profile l1 --profile l2 --profile debug --profile staterecovery kill -s 9 || true
docker compose -f docker/compose-tracing-v1-ci-extension.yml -f docker/compose-tracing-v2-ci-extension.yml --profile l1 --profile l2 --profile debug --profile staterecovery down || true
make clean-local-folders
docker volume rm linea-local-dev linea-logs || true # ignore failure if volumes do not exist already
docker system prune -f || true
docker compose -f docker/compose-tracing-v1-ci-extension.yml -f docker/compose-tracing-v2-ci-extension.yml --profile l1 --profile l2 --profile debug --profile staterecovery kill -s 9 || true;
docker compose -f docker/compose-tracing-v1-ci-extension.yml -f docker/compose-tracing-v2-ci-extension.yml --profile l1 --profile l2 --profile debug --profile staterecovery down || true;
make clean-local-folders;
docker volume rm linea-local-dev linea-logs || true; # ignore failure if volumes do not exist already
docker system prune -f || true;
start-env: COMPOSE_PROFILES:=l1,l2
start-env: CLEAN_PREVIOUS_ENV:=true
@@ -40,8 +40,9 @@ start-env:
make clean-environment; \
else \
echo "Starting stack reusing previous state"; \
fi
L1_GENESIS_TIME=$(get_future_time) COMPOSE_PROFILES=$(COMPOSE_PROFILES) docker compose -f $(COMPOSE_FILE) up -d
fi; \
mkdir -p tmp/local; \
L1_GENESIS_TIME=$(get_future_time) COMPOSE_PROFILES=$(COMPOSE_PROFILES) docker compose -f $(COMPOSE_FILE) up -d; \
if [ "$(SKIP_CONTRACTS_DEPLOYMENT)" = "true" ]; then \
echo "Skipping contracts deployment"; \
else \