From 907b61cd3b38dea727d4aa525e103f1acab59c02 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 27 Nov 2025 20:18:24 +0100 Subject: [PATCH] add redis to e2e tests --- .github/workflows/test_backend.yml | 2 +- .github/workflows/test_dht_node.yml | 2 +- .github/workflows/test_e2e.yml | 19 +++++++++++-------- .github/workflows/test_federation.yml | 2 +- docker-compose.yml | 1 - 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test_backend.yml b/.github/workflows/test_backend.yml index 7fe8a5745..4098e8ae6 100644 --- a/.github/workflows/test_backend.yml +++ b/.github/workflows/test_backend.yml @@ -51,7 +51,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: docker-compose mariadb + - name: docker-compose mariadb redis run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb redis - name: install bun diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index 10bdffa32..f2288f82c 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -48,7 +48,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: docker-compose mariadb + - name: docker-compose mariadb redis run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb redis - name: install bun diff --git a/.github/workflows/test_e2e.yml b/.github/workflows/test_e2e.yml index ff54ce43b..249523c41 100644 --- a/.github/workflows/test_e2e.yml +++ b/.github/workflows/test_e2e.yml @@ -20,7 +20,7 @@ jobs: with: bun-version-file: '.bun-version' - - name: Boot up test system | docker-compose mariadb mailserver + - name: Boot up test system | docker-compose mariadb mailserver redis run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver redis - name: Prepare test system @@ -63,10 +63,11 @@ jobs: sudo nginx -t sudo systemctl start nginx - - name: wait for nginx and mailserver to be ready + - name: wait for nginx, mailserver and redis to be ready run: | until nc -z 127.0.0.1 80; do echo waiting for nginx; sleep 1; done; until nc -z 127.0.0.1 1025; do echo waiting for mailserver; sleep 1; done; + until nc -z 127.0.0.1 6379; do echo waiting for redis; sleep 1; done; - name: End-to-end tests | run tests id: e2e-tests @@ -125,8 +126,8 @@ jobs: with: bun-version-file: '.bun-version' - - name: Boot up test system | docker-compose mariadb mailserver - run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver + - name: Boot up test system | docker-compose mariadb mailserver redis + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver redis - name: Prepare test system run: | @@ -169,10 +170,11 @@ jobs: sudo nginx -t sudo systemctl start nginx - - name: wait for nginx and mailserver to be ready + - name: wait for nginx, mailserver and redis to be ready run: | until nc -z 127.0.0.1 80; do echo waiting for nginx; sleep 1; done; until nc -z 127.0.0.1 1025; do echo waiting for mailserver; sleep 1; done; + until nc -z 127.0.0.1 6379; do echo waiting for redis; sleep 1; done; - name: End-to-end tests | run tests id: e2e-tests @@ -210,8 +212,8 @@ jobs: with: bun-version-file: '.bun-version' - - name: Boot up test system | docker-compose mariadb mailserver - run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver + - name: Boot up test system | docker-compose mariadb mailserver redis + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach mariadb mailserver redis - name: Prepare test system run: | @@ -250,10 +252,11 @@ jobs: sudo nginx -t sudo systemctl start nginx - - name: wait for nginx and mailserver to be ready + - name: wait for nginx, mailserver and redis to be ready run: | until nc -z 127.0.0.1 80; do echo waiting for nginx; sleep 1; done; until nc -z 127.0.0.1 1025; do echo waiting for mailserver; sleep 1; done; + until nc -z 127.0.0.1 6379; do echo waiting for redis; sleep 1; done; - name: End-to-end tests | run tests id: e2e-tests diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index 82bae06ae..b462151e7 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -48,7 +48,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: docker-compose mariadb + - name: docker-compose mariadb redis run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb redis - name: install bun diff --git a/docker-compose.yml b/docker-compose.yml index 498207c3e..4d305b4bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -81,7 +81,6 @@ services: ######################################################### redis: image: redis:6.2.6 - attach: false networks: - internal-net ports: