From 343d2af72695fe69f13117562eb8db87bf180ac5 Mon Sep 17 00:00:00 2001 From: Declan Carroll Date: Thu, 19 Feb 2026 07:27:03 +0000 Subject: [PATCH] ci: Enable Ryuk cleanup for testcontainers (#25848) Co-authored-by: Claude Opus 4.6 --- .github/workflows/test-e2e-coverage-weekly.yml | 1 - .github/workflows/test-e2e-reusable.yml | 2 -- packages/cli/jest.config.integration.testcontainers.js | 7 +++---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-e2e-coverage-weekly.yml b/.github/workflows/test-e2e-coverage-weekly.yml index 24299fe9208..e43a183de99 100644 --- a/.github/workflows/test-e2e-coverage-weekly.yml +++ b/.github/workflows/test-e2e-coverage-weekly.yml @@ -7,7 +7,6 @@ on: env: NODE_OPTIONS: --max-old-space-size=16384 - TESTCONTAINERS_RYUK_DISABLED: true PLAYWRIGHT_WORKERS: 4 PLAYWRIGHT_BROWSERS_PATH: packages/testing/playwright/.playwright-browsers diff --git a/.github/workflows/test-e2e-reusable.yml b/.github/workflows/test-e2e-reusable.yml index c812ac198b5..b1cc0897169 100644 --- a/.github/workflows/test-e2e-reusable.yml +++ b/.github/workflows/test-e2e-reusable.yml @@ -80,8 +80,6 @@ on: env: NODE_OPTIONS: ${{ contains(inputs.runner, '2vcpu') && '--max-old-space-size=6144' || '' }} - # Disable Ryuk to avoid issues with Docker since it needs privileged access, containers are cleaned on teardown anyway - TESTCONTAINERS_RYUK_DISABLED: true PLAYWRIGHT_WORKERS: ${{ inputs.workers != '' && inputs.workers || '2' }} # Browser cache location - must match install-browsers script PLAYWRIGHT_BROWSERS_PATH: packages/testing/playwright/.playwright-browsers diff --git a/packages/cli/jest.config.integration.testcontainers.js b/packages/cli/jest.config.integration.testcontainers.js index d8db370103e..0df1891ba3c 100644 --- a/packages/cli/jest.config.integration.testcontainers.js +++ b/packages/cli/jest.config.integration.testcontainers.js @@ -4,10 +4,9 @@ * * Usage: pnpm test:postgres:tc * - * Note: TESTCONTAINERS_RYUK_DISABLED=true is set in the npm script because: - * 1. Ryuk requires privileged Docker access not available in all CI environments - * 2. Containers use withReuse() and are cleaned up in globalTeardown - * 3. If tests crash, containers may linger - run `docker ps` to check + * Note: Ryuk is enabled by default and handles container cleanup on process exit, + * including crashes and timeouts. Containers also use withReuse() and are + * cleaned up in globalTeardown as a secondary cleanup mechanism. */ /** @type {import('jest').Config} */