From 178c84ba60ca21a6bf2a42e39ed03cd113a799ed Mon Sep 17 00:00:00 2001 From: Jeppe Bundgaard Date: Wed, 1 Jul 2026 10:57:39 +0200 Subject: [PATCH] Use direct broker port for API CI smoke --- .github/docker-compose.ci.yml | 2 ++ .github/workflows/tests.yml | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/docker-compose.ci.yml b/.github/docker-compose.ci.yml index 76726460..ed8cef29 100644 --- a/.github/docker-compose.ci.yml +++ b/.github/docker-compose.ci.yml @@ -11,6 +11,8 @@ services: edge-broker: container_name: "${COMPOSE_PROJECT_NAME:-api}-edge-broker" + ports: + - "127.0.0.1:${EDGE_BROKER_CI_PORT:-14300}:4300" labels: - "traefik.http.routers.edge-broker-local-ci.rule=PathPrefix(`/api/edge-broker`)" - "traefik.http.routers.edge-broker-local-ci.entrypoints=web" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d480e7ff..c05fe111 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -161,6 +161,7 @@ jobs: TRAEFIK_WEBSECURE_PORT: "18443" TRAEFIK_WEBSECURE_STAGING_PORT: "18433" TRAEFIK_METRICS_PORT: "19100" + EDGE_BROKER_CI_PORT: "14300" EDGE_GATEWAY_E2E_BASE_URL: "http://localhost:18080/api" steps: @@ -205,12 +206,14 @@ jobs: websecure_port="$(find_free_port "$((web_port + 1))" "$((web_port + 2000))")" staging_port="$(find_free_port "$((websecure_port + 1))" "$((websecure_port + 2000))")" metrics_port="$(find_free_port "$((staging_port + 1))" "$((staging_port + 2000))")" + broker_port="$(find_free_port "$((metrics_port + 1))" "$((metrics_port + 2000))")" { echo "TRAEFIK_WEB_PORT=${web_port}" echo "TRAEFIK_WEBSECURE_PORT=${websecure_port}" echo "TRAEFIK_WEBSECURE_STAGING_PORT=${staging_port}" echo "TRAEFIK_METRICS_PORT=${metrics_port}" + echo "EDGE_BROKER_CI_PORT=${broker_port}" echo "EDGE_GATEWAY_E2E_BASE_URL=http://localhost:${web_port}/api" echo "EDGE_GATEWAY_E2E_COMPOSE_PROJECT=${COMPOSE_PROJECT_NAME}" } >> "$GITHUB_ENV" @@ -220,7 +223,7 @@ jobs: set -euo pipefail cp .github/ci.env .env cp .github/ci.env.staging .env.staging - printf '\nEDGE_PUBLIC_BROKER_URL=http://edge-broker:4300\n' >> .env + printf '\nEDGE_PUBLIC_BROKER_URL=http://localhost:%s\n' "$EDGE_BROKER_CI_PORT" >> .env - name: Setup Node.js uses: actions/setup-node@v4