From 83171d3a2d43a0c56406a9414a001297896f656e Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Wed, 10 Sep 2025 23:41:55 +0000 Subject: [PATCH] ci: add integration test for graceful Gateway shutdown (#10077) Signed-off-by: Thomas Eizinger --- .github/workflows/_integration_tests.yml | 1 + docker-compose.yml | 4 ++-- scripts/tests/direct-curl-gateway-restart.sh | 11 +++++++++++ scripts/tests/lib.sh | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100755 scripts/tests/direct-curl-gateway-restart.sh diff --git a/.github/workflows/_integration_tests.yml b/.github/workflows/_integration_tests.yml index 211418196..8c9e503ea 100644 --- a/.github/workflows/_integration_tests.yml +++ b/.github/workflows/_integration_tests.yml @@ -102,6 +102,7 @@ jobs: test: - name: direct-curl-api-down - name: direct-curl-api-restart + - name: direct-curl-gateway-restart - name: direct-curl-ecn - name: direct-download-packet-loss - name: direct-dns-api-down diff --git a/docker-compose.yml b/docker-compose.yml index e3723e70a..b8265259a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -384,7 +384,7 @@ services: apk add --no-cache ethtool ethtool -K eth0 tx off - firezone-headless-client + exec firezone-headless-client init: true build: target: ${DOCKER_BUILD_TARGET:-debug} @@ -455,7 +455,7 @@ services: ethtool -K eth1 tx off ethtool -K eth2 tx off - firezone-gateway + exec firezone-gateway init: true build: target: ${DOCKER_BUILD_TARGET:-debug} diff --git a/scripts/tests/direct-curl-gateway-restart.sh b/scripts/tests/direct-curl-gateway-restart.sh new file mode 100755 index 000000000..92e433aed --- /dev/null +++ b/scripts/tests/direct-curl-gateway-restart.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +source "./scripts/tests/lib.sh" + +client_curl_resource "172.20.0.100/get" +client_curl_resource "[172:20:0::100]/get" + +docker compose restart gateway + +client_curl_resource "172.20.0.100/get" +client_curl_resource "[172:20:0::100]/get" diff --git a/scripts/tests/lib.sh b/scripts/tests/lib.sh index aee76cbc3..c557e6d9d 100755 --- a/scripts/tests/lib.sh +++ b/scripts/tests/lib.sh @@ -19,7 +19,7 @@ function relay2() { } function client_curl_resource() { - client curl --connect-timeout 30 --fail "$1" >/dev/null + client curl --connect-timeout 10 --fail "$1" >/dev/null } function client_ping_resource() {