Skip to content

Commit

Permalink
refactor: Simplify e2e test commands (#640)
Browse files Browse the repository at this point in the history
boecklim authored Nov 12, 2024
1 parent 47b083a commit 1e5980e
Showing 5 changed files with 26 additions and 39 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/go.yaml
Original file line number Diff line number Diff line change
@@ -78,8 +78,5 @@ jobs:

- name: e2e test
run: |
docker compose up -d node1 node2 node3 db
docker compose up --abort-on-container-exit migrate-blocktx migrate-metamorph
docker compose up --exit-code-from tests tests arc-blocktx arc-callbacker arc-metamorph arc --scale arc-blocktx=5 --scale arc-metamorph=2
docker compose up blocktx callbacker metamorph api tests --scale blocktx=4 --scale metamorph=2 --exit-code-from tests
docker compose down
working-directory: ./test
11 changes: 3 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -26,23 +26,18 @@ build_docker:
.PHONY: run
run:
docker compose down --remove-orphans
docker compose up --abort-on-container-exit migrate-blocktx migrate-metamorph migrate-callbacker
docker compose up --build arc-blocktx arc-callbacker arc-metamorph arc
docker compose down
docker compose up --build blocktx callbacker metamorph api

.PHONY: run_e2e_tests
run_e2e_tests:
docker compose down --remove-orphans
docker compose up --abort-on-container-exit migrate-blocktx migrate-metamorph migrate-callbacker
docker compose up --build --exit-code-from tests tests arc-blocktx arc-callbacker arc-metamorph arc --scale arc-blocktx=4 --scale arc-metamorph=2
docker compose up --build blocktx callbacker metamorph api tests --scale blocktx=4 --scale metamorph=2 --exit-code-from tests
docker compose down

.PHONY: run_e2e_tests_with_tracing
run_e2e_tests_with_tracing:
docker compose down --remove-orphans
docker compose up --abort-on-container-exit migrate-blocktx migrate-metamorph migrate-callbacker
ARC_TRACING_ENABLED docker compose up --build --exit-code-from tests tests arc-blocktx arc-callbacker arc-metamorph arc arc-jaeger --scale arc-blocktx=4 --scale arc-metamorph=2
docker compose down
ARC_TRACING_ENABLED=TRUE docker compose up --build blocktx callbacker metamorph api tests jaeger --scale blocktx=4 --scale metamorph=2 --no-attach jaeger

.PHONY: test
test:
37 changes: 16 additions & 21 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -19,8 +19,6 @@ services:
node2:
container_name: node2
image: bitcoinsv/bitcoin-sv:1.1.0
ports:
- "48332:18332"
expose:
- "18332"
- "18333"
@@ -34,8 +32,6 @@ services:
node3:
container_name: node3
image: bitcoinsv/bitcoin-sv:1.1.0
ports:
- "58332:18332"
expose:
- "18332"
- "18333"
@@ -123,7 +119,7 @@ services:
nats-1:
image: nats:2.10.18-alpine3.20
container_name: nats-server-1
restart: no
restart: on-failure
ports:
- "4222:4222"
hostname: nats-server
@@ -139,7 +135,7 @@ services:
nats-2:
image: nats:2.10.18-alpine3.20
container_name: nats-server-2
restart: no
restart: on-failure
ports:
- "4223:4222"
hostname: nats-server
@@ -152,17 +148,17 @@ services:
timeout: 5s
retries: 5

arc-redis:
cache:
image: redis
hostname: redis
ports:
- "6379:6379"
volumes:
- arc-redis-data:/data
- redis-data:/data
healthcheck:
test: [ "CMD", "redis-cli", "ping" ]

arc-blocktx:
blocktx:
build: ./
expose:
- "8011"
@@ -184,16 +180,14 @@ services:
condition: service_healthy
migrate-blocktx:
condition: service_completed_successfully
migrate-metamorph:
condition: service_completed_successfully

healthcheck:
test: ["CMD", "/bin/grpc_health_probe", "-addr=:8006", "-service=liveness", "-rpc-timeout=5s"]
interval: 10s
timeout: 5s
retries: 3

arc-callbacker:
callbacker:
build: ./
expose:
- "8021"
@@ -211,7 +205,7 @@ services:
timeout: 5s
retries: 3

arc-metamorph:
metamorph:
build: ./
expose:
- "8001"
@@ -221,11 +215,11 @@ services:
volumes:
- ./test/config/config.yaml:/service/config.yaml
depends_on:
arc-blocktx:
blocktx:
condition: service_healthy
arc-callbacker:
callbacker:
condition: service_healthy
arc-redis:
cache:
condition: service_healthy
migrate-metamorph:
condition: service_completed_successfully
@@ -235,7 +229,7 @@ services:
timeout: 5s
retries: 3

arc:
api:
build: ./
ports:
- "8011:8011"
@@ -251,11 +245,12 @@ services:
volumes:
- ./test/config/config.yaml:/service/config.yaml
depends_on:
arc-metamorph:
metamorph:
condition: service_healthy

arc-jaeger:
jaeger:
image: jaegertracing/all-in-one:1.35
profiles: ["tracing"]
ports:
- "16686:16686"
- "4317:4317"
@@ -269,7 +264,7 @@ services:
context: ./
dockerfile: ./test/Dockerfile
depends_on:
- arc
- api

volumes:
node1-data:
@@ -282,5 +277,5 @@ volumes:
external: false
nats2-data:
external: false
arc-redis-data:
redis-data:
external: false
10 changes: 5 additions & 5 deletions test/config/config.yaml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ messageQueue:
tracing:
enabled: false
sample: 100
dialAddr: http://arc-jaeger:4317
dialAddr: http://jaeger:4317

peerRpc:
password: bitcoin
@@ -42,13 +42,13 @@ broadcasting: # settings for connection to nodes
cache:
engine: redis
redis:
addr: arc-redis:6379
addr: cache:6379
password: ""
db: 1

metamorph:
listenAddr: 0.0.0.0:8001
dialAddr: arc-metamorph:8001
dialAddr: metamorph:8001
db:
mode: postgres
postgres:
@@ -78,7 +78,7 @@ metamorph:

blocktx:
listenAddr: 0.0.0.0:8011
dialAddr: arc-blocktx:8011
dialAddr: blocktx:8011
healthServerDialAddr: localhost:8006
db:
mode: postgres
@@ -134,7 +134,7 @@ api:

callbacker:
listenAddr: 0.0.0.0:8021
dialAddr: arc-callbacker:8021
dialAddr: callbacker:8021
health:
serverDialAddr: localhost:8022
db:
2 changes: 1 addition & 1 deletion test/e2e_globals.go
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ const (
const (
feeSat = 10

arcEndpoint = "http://arc:9090/"
arcEndpoint = "http://api:9090/"
v1Tx = "v1/tx"
v1Txs = "v1/txs"
arcEndpointV1Tx = arcEndpoint + v1Tx

0 comments on commit 1e5980e

Please sign in to comment.