From bdf196cf39ec8ffed186bddf82f6661f2092f87e Mon Sep 17 00:00:00 2001 From: delong3 <236298779+delong3@users.noreply.github.com> Date: Thu, 23 Oct 2025 15:39:28 +1100 Subject: [PATCH] fix(ci): v1 zdr tests + 12 workers for tests + reduced matrix --- .github/workflows/test-server.yml | 18 +++++++++++++----- apps/api/src/__tests__/snips/v1/lib.ts | 2 +- apps/api/src/__tests__/snips/v1/zdr.test.ts | 2 ++ apps/api/src/__tests__/snips/v2/lib.ts | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-server.yml b/.github/workflows/test-server.yml index c303f5883..c8e71c9ad 100644 --- a/.github/workflows/test-server.yml +++ b/.github/workflows/test-server.yml @@ -24,6 +24,7 @@ jobs: pnpm dlx audit-ci@^7 --directory apps/playwright-service-ts --config apps/playwright-service-ts/audit-ci.jsonc pnpm dlx audit-ci@^7 --directory apps/test-site --config apps/test-site/audit-ci.jsonc + # Job seems unused, remove once confirmed # build-images: # name: Build images # runs-on: big-runner @@ -52,12 +53,18 @@ jobs: self-host: name: Self-hosted environment tests strategy: - matrix: - engine: ["playwright", "fetch"] - proxy: ["proxy", "no-proxy"] - search: ["searxng", "google"] - ai: ["openai", "no-ai"] fail-fast: false + matrix: + engine: ["playwright", "fetch"] # unsure if we need both of these + proxy: ["proxy", "no-proxy"] # proxy / no-proxy run different tests, keep both + search: ["searxng"] # disabled google for now, should be fine with just Searxng + ai: ["openai"] # AI only should be fine, as it simply adds tests, if non-AI fails, AI will fail. + + # legacy matrix: + # engine: ["playwright", "fetch"] + # proxy: ["proxy", "no-proxy"] + # search: ["searxng", "google"] + # ai: ["openai", "no-ai"] runs-on: big-runner needs: audit services: @@ -78,6 +85,7 @@ jobs: NUQ_DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres USE_GO_MARKDOWN_PARSER: true ALLOW_LOCAL_WEBHOOKS: true + NUQ_WORKER_COUNT: 12 steps: - uses: actions/checkout@v5 diff --git a/apps/api/src/__tests__/snips/v1/lib.ts b/apps/api/src/__tests__/snips/v1/lib.ts index 2e75db40d..5664cb87f 100644 --- a/apps/api/src/__tests__/snips/v1/lib.ts +++ b/apps/api/src/__tests__/snips/v1/lib.ts @@ -25,7 +25,7 @@ import { // Re-export shared utilities for backwards compatibility export { scrapeTimeout, indexCooldown, Identity, idmux }; -const pollSleep = async () => new Promise(r => setTimeout(r, 250)); +const pollSleep = async () => new Promise(r => setTimeout(r, 50)); export async function scrapeRaw(body: ScrapeRequestInput, identity: Identity) { return await request(TEST_API_URL) diff --git a/apps/api/src/__tests__/snips/v1/zdr.test.ts b/apps/api/src/__tests__/snips/v1/zdr.test.ts index c75104813..9bbb17c47 100644 --- a/apps/api/src/__tests__/snips/v1/zdr.test.ts +++ b/apps/api/src/__tests__/snips/v1/zdr.test.ts @@ -34,6 +34,8 @@ const logIgnoreList = [ "Prefetched jobs", "nuqPrefetchJobs metrics", "request completed", + "nuqAddJobs metrics", + "nuqGetJobs metrics", ]; async function getLogs() { diff --git a/apps/api/src/__tests__/snips/v2/lib.ts b/apps/api/src/__tests__/snips/v2/lib.ts index e076e3cfe..2dd5e14d1 100644 --- a/apps/api/src/__tests__/snips/v2/lib.ts +++ b/apps/api/src/__tests__/snips/v2/lib.ts @@ -26,7 +26,7 @@ import { SearchV2Response } from "../../../lib/entities"; // Re-export shared utilities for backwards compatibility export { scrapeTimeout, indexCooldown, Identity, idmux }; -const pollSleep = async () => new Promise(r => setTimeout(r, 250)); +const pollSleep = async () => new Promise(r => setTimeout(r, 50)); // ========================================= // Scrape API