Skip to content

Commit f6f01b9

Browse files
authored
e2e test master workflow (#615)
* e2e test master workflow * trigger image build for tests changes to run test after image was built
1 parent 756196c commit f6f01b9

File tree

5 files changed

+25
-19
lines changed

5 files changed

+25
-19
lines changed
Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
name: "[Nethermind] Catalyst Stack - Pytest"
1+
name: "[Nethermind] Catalyst e2e Stack - Pytest"
22

33
on:
44
workflow_dispatch:
5-
push:
6-
branches: [master]
5+
workflow_run:
6+
workflows: ["[Nethermind] Catalyst Node - Docker build and push"]
7+
types: [completed]
8+
branches: [master]
79

810
env:
9-
TARGET_MACHINE_IP: 178.79.141.170
11+
TARGET_MACHINE_IP: 178.79.157.173
1012
jobs:
1113
build:
1214
name: Set and run pytest
@@ -22,16 +24,18 @@ jobs:
2224
- name: SSH into target machine
2325
run: |
2426
ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 -o ServerAliveCountMax=30 root@${{ env.TARGET_MACHINE_IP }} << 'EOF'
25-
docker pull nethswitchboard/catalyst-node:latest
26-
docker pull nethswitchboard/catalyst-pytest:latest
27-
docker pull nethswitchboard/preconf-taiko-client:latest
28-
docker pull nethswitchboard/preconf-taiko-protocol:latest
29-
30-
kurtosis enclave rm taiko-preconf-devnet --force
31-
kurtosis clean -a
32-
cd ~/preconfirm-devnet-package
27+
cd ~/e2e_catalyst_tests/simple_taiko_node
28+
git pull
29+
cp .env.example .env
30+
docker compose down -v --remove-orphans
31+
docker compose up -d
32+
cd ~/e2e_catalyst_tests/catalyst/e2e_tests
3333
git pull
34-
kurtosis run --enclave taiko-preconf-devnet . --args-file network_params.yaml
34+
python3 -m venv venv
35+
source venv/bin/activate
36+
pip install -r requirements.txt
37+
cp .env.example .env
38+
pytest -s -v
3539
EOF
3640
3741
- name: Summary

.github/workflows/node_docker_build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ on:
1111
- "permissionless/**"
1212
- "whitelist/**"
1313
- "tools/p2p_node/p2p_network/**"
14+
- "e2e_tests/**"
1415

1516
env:
16-
DOCKER_PUBLIC_REGISTRY: docker.io
17+
DOCKER_PUBLIC_REGISTRY: docker.io
1718
DOCKER_PUBLIC_REPOSITORY: nethermind/catalyst-node
1819
DOCKER_REGISTRY: nethermind.jfrog.io
1920
DOCKER_REPOSITORY_STAGING: core-oci-local-staging/catalyst-node
@@ -116,10 +117,10 @@ jobs:
116117
$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
117118
${{ needs.build.outputs.digest-amd64 }} \
118119
${{ needs.build.outputs.digest-arm64 }}
119-
120+
120121
- name: Setup ORAS
121122
uses: oras-project/setup-oras@v1
122-
123+
123124
- name: Check ORAS version
124125
run: oras version
125126

@@ -165,7 +166,7 @@ jobs:
165166
echo "Promoting ${source_image} to ${prod_image}"
166167
oras cp -r "${source_image}" "${prod_image}"
167168
done
168-
169+
169170
- name: Summary
170171
run: |
171172
echo "## Catalyst Node Docker build Completed" >> $GITHUB_STEP_SUMMARY
File renamed without changes.

e2e_tests/.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ L1_RPC_URL=http://localhost:32002
33
BEACON_RPC_URL=http://localhost:33001
44

55
# L2 (Taiko) RPC URL
6-
L2_RPC_URL_NODE1=http://localhost:32801
7-
L2_RPC_URL_NODE2=http://localhost:32808
6+
L2_RPC_URL_NODE1=http://localhost:8547
7+
L2_RPC_URL_NODE2=http://localhost:8647
88

99
TAIKO_INBOX_ADDRESS=0xa4fD91B3b1032e1fd0d7623A54B1a399aaaF9ab5
1010
PRECONF_WHITELIST_ADDRESS=0xD9BFe39BA99503baA8cBA3DF08e3C9421889Fd44

e2e_tests/test_preocnfirmation_after_restart.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ def restart_container(container_name):
1919
print(result.stderr)
2020
assert False, "Error restarting container"
2121

22+
pytest.skip("Skipping test_preocnfirmation_after_restart.py until issue https://github.com/NethermindEth/Catalyst/issues/611 is fixed", allow_module_level=True)
2223
def test_preocnfirmation_after_restart(l1_client, beacon_client, l2_client_node1, env_vars):
2324
"""
2425
We restart the nodes and then produce 30 transactions every 2 L2 slots. We expect to receive 30 L2 blocks and 3 batches at the end

0 commit comments

Comments
 (0)