From cd19d06680a5b7035975de586dc3df88ad65fd93 Mon Sep 17 00:00:00 2001 From: copilotcoder Date: Wed, 22 Jul 2026 16:36:43 -0400 Subject: [PATCH] ci(e2e): align Playwright runtime image to 1.61.1 --- .gitea/workflows/cicd.yaml | 8 ++++---- scripts/gitea-actions/repair_runner_mirror.xsh | 2 +- scripts/run-ci-e2e-compose.sh | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/cicd.yaml b/.gitea/workflows/cicd.yaml index 80a174e..f18d828 100644 --- a/.gitea/workflows/cicd.yaml +++ b/.gitea/workflows/cicd.yaml @@ -324,8 +324,8 @@ jobs: docker_login_with_retry 5 3 - PLAYWRIGHT_BROWSERS_MIRROR_TAG="${GITEA_REGISTRY}/darkhelm.org/playwright-browsers:v1.56.1-jammy" - PLAYWRIGHT_BROWSERS_UPSTREAM_TAG="mcr.microsoft.com/playwright:v1.56.1-jammy" + PLAYWRIGHT_BROWSERS_MIRROR_TAG="${GITEA_REGISTRY}/darkhelm.org/playwright-browsers:v1.61.1-jammy" + PLAYWRIGHT_BROWSERS_UPSTREAM_TAG="mcr.microsoft.com/playwright:v1.61.1-jammy" PLAYWRIGHT_BROWSERS_LOCAL_TAG="$(./scripts/resolve-mirrored-image.sh \ --image "${PLAYWRIGHT_BROWSERS_MIRROR_TAG}" \ --mirror-image "${PLAYWRIGHT_BROWSERS_MIRROR_TAG}" \ @@ -1442,8 +1442,8 @@ jobs: run: | set -euo pipefail - PLAYWRIGHT_BASE_IMAGE_MIRROR="${GITEA_REGISTRY}/darkhelm.org/playwright-browsers:v1.56.1-jammy" - PLAYWRIGHT_BASE_IMAGE_UPSTREAM="mcr.microsoft.com/playwright:v1.56.1-jammy" + PLAYWRIGHT_BASE_IMAGE_MIRROR="${GITEA_REGISTRY}/darkhelm.org/playwright-browsers:v1.61.1-jammy" + PLAYWRIGHT_BASE_IMAGE_UPSTREAM="mcr.microsoft.com/playwright:v1.61.1-jammy" docker_login_with_retry() { attempts="${1:-5}" diff --git a/scripts/gitea-actions/repair_runner_mirror.xsh b/scripts/gitea-actions/repair_runner_mirror.xsh index 6904ac0..422e4cb 100755 --- a/scripts/gitea-actions/repair_runner_mirror.xsh +++ b/scripts/gitea-actions/repair_runner_mirror.xsh @@ -14,7 +14,7 @@ remote_code_template = """ mirror_pairs = [ ("ACT_UBUNTU", "ghcr.io/catthehacker/ubuntu:act-latest", "kankali.darkhelm.lan:3001/darkhelm.org/act-ubuntu:act-latest"), ("RENOVATE", "ghcr.io/renovatebot/renovate:41", "kankali.darkhelm.lan:3001/darkhelm.org/renovate:41"), - ("PLAYWRIGHT", "mcr.microsoft.com/playwright:v1.56.1-jammy", "kankali.darkhelm.lan:3001/darkhelm.org/playwright-browsers:v1.56.1-jammy"), + ("PLAYWRIGHT", "mcr.microsoft.com/playwright:v1.61.1-jammy", "kankali.darkhelm.lan:3001/darkhelm.org/playwright-browsers:v1.61.1-jammy"), ] is_publisher = __IS_PUBLISHER__ diff --git a/scripts/run-ci-e2e-compose.sh b/scripts/run-ci-e2e-compose.sh index 9e2919b..f39a0c7 100644 --- a/scripts/run-ci-e2e-compose.sh +++ b/scripts/run-ci-e2e-compose.sh @@ -12,6 +12,7 @@ export DEPLOYABLE_FRONTEND_IMAGE="${DEPLOYABLE_FRONTEND_IMAGE:-plex-playlist-fro export DB_PASSWORD="${DB_PASSWORD:-plex_password}" export DB_URL="${DB_URL:-postgresql://plex_user:${DB_PASSWORD}@database:5432/plex_playlist}" export E2E_ARTIFACT_DIR="${E2E_ARTIFACT_DIR:-${ROOT_DIR}/frontend/.playwright-artifacts}" +export PLAYWRIGHT_E2E_IMAGE="${PLAYWRIGHT_E2E_IMAGE:-mcr.microsoft.com/playwright:v1.61.1-jammy}" cleanup() { docker compose -p "${PROJECT_NAME}" -f "${COMPOSE_FILE}" down -v --remove-orphans >/dev/null 2>&1 || true @@ -23,6 +24,7 @@ echo "Running E2E tests against runtime backend/frontend images via compose" echo "DEPLOYABLE_BACKEND_IMAGE=${DEPLOYABLE_BACKEND_IMAGE}" echo "DEPLOYABLE_FRONTEND_IMAGE=${DEPLOYABLE_FRONTEND_IMAGE}" echo "E2E_ARTIFACT_DIR=${E2E_ARTIFACT_DIR}" +echo "PLAYWRIGHT_E2E_IMAGE=${PLAYWRIGHT_E2E_IMAGE}" docker compose -p "${PROJECT_NAME}" -f "${COMPOSE_FILE}" up -d database backend frontend @@ -34,5 +36,5 @@ docker run --rm \ -e PLAYWRIGHT_JUNIT_OUTPUT_FILE=/tmp/playwright-artifacts/playwright-results.xml \ -v "${ROOT_DIR}/frontend:/workspace/frontend" \ -v "${E2E_ARTIFACT_DIR}:/tmp/playwright-artifacts" \ - mcr.microsoft.com/playwright:v1.56.1-jammy \ + "${PLAYWRIGHT_E2E_IMAGE}" \ bash -lc "cd /workspace/frontend && corepack enable && yarn install --immutable && yarn test:e2e --reporter=list --timeout=90000"