chore(test): run related E2E deploy tests on PRs (#63763)

balazsorban44 · web-flow · commit 31921728989c · 2024-04-17T11:06:23.000Z
diff --git a/.github/workflows/test_e2e_deploy.yml b/.github/workflows/test_e2e_deploy.yml
diff --git a/.github/workflows/test_e2e_deploy_related.yml b/.github/workflows/test_e2e_deploy_related.yml
@@ -0,0 +1,81 @@
+name: Test E2E (Vercel Deploy), related
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  test:
+    if: github.repository_owner == 'vercel'
+    runs-on: ubuntu-latest
+
+    env:
+      CARGO_PROFILE_RELEASE_LTO: 'true'
+      DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
+      DD_ENV: 'ci'
+      NAPI_CLI_VERSION: 2.16.2
+      NEXT_JUNIT_TEST_REPORT: 'true'
+      NEXT_TELEMETRY_DISABLED: 1
+      NEXT_TEST_JOB: 1
+      NEXT_TEST_MODE: 'deploy'
+      NODE_LTS_VERSION: 20
+      TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
+      TURBO_REMOTE_ONLY: 'true'
+      TURBO_TEAM: 'vercel'
+      TURBO_VERSION: 1.12.5
+      VERCEL_TEST_TEAM: vtest314-next-e2e-tests
+      VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
+
+    strategy:
+      fail-fast: false
+
+    steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_LTS_VERSION }}
+          check-latest: true
+
+      - name: Setup pnpm
+        run: corepack enable
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 25
+
+      - name: Setup tests
+        run: |
+          pnpm install
+          pnpm run build
+          npm i -g vercel@latest
+          node scripts/run-e2e-test-project-reset.mjs
+
+      - name: Run tests
+        run: |
+          docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.41.2-jammy /bin/bash -c "cd /work && \
+          NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && \ 
+          corepack enable > /dev/null && \
+          NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \
+          DATADOG_API_KEY=${{ env.DATADOG_API_KEY }} \
+          DD_ENV=${{ env.DD_ENV }} \ 
+          VERCEL_TEST_TOKEN=${{ env.VERCEL_TEST_TOKEN }} \
+          VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \
+          NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \
+          NEXT_TEST_MODE=${{ env.NEXT_TEST_MODE }} \
+          TEST_TIMINGS_TOKEN=${{ env.TEST_TIMINGS_TOKEN }} \
+          xvfb-run node run-tests.js --related --timings -c 1 >> /proc/1/fd/1"
+
+      - name: Save test report as artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-reports
+          if-no-files-found: ignore
+          retention-days: 2
+          path: test/test-junit-report
+
+      - name: Upload test report to Datadog
+        continue-on-error: true
+        run: |
+          pnpx @datadog/datadog-ci@2.23.1 junit upload --tags test.type:nextjs_deploy_e2e --service nextjs ./test/test-junit-report
diff --git a/.github/workflows/test_e2e_deploy_scheduled.yml b/.github/workflows/test_e2e_deploy_scheduled.yml
@@ -0,0 +1,87 @@
+name: Test E2E (Vercel Deploy), scheduled
+
+on:
+  schedule:
+    # run every day at midnight
+    - cron: '0 0 * * *'
+  # allow triggering manually as well
+  workflow_dispatch:
+
+jobs:
+  test:
+    if: github.repository_owner == 'vercel'
+    runs-on: ubuntu-latest
+
+    env:
+      CARGO_PROFILE_RELEASE_LTO: 'true'
+      DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
+      DD_ENV: 'ci'
+      NAPI_CLI_VERSION: 2.16.2
+      NEXT_JUNIT_TEST_REPORT: 'true'
+      NEXT_TELEMETRY_DISABLED: 1
+      NEXT_TEST_CONTINUE_ON_ERROR: 1
+      NEXT_TEST_JOB: 1
+      NEXT_TEST_MODE: 'deploy'
+      NODE_LTS_VERSION: 20
+      TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
+      TURBO_REMOTE_ONLY: 'true'
+      TURBO_TEAM: 'vercel'
+      TURBO_VERSION: 1.12.5
+      VERCEL_TEST_TEAM: vtest314-next-e2e-tests
+      VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        group: [1, 2]
+
+    steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_LTS_VERSION }}
+          check-latest: true
+
+      - name: Setup pnpm
+        run: corepack enable
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 25
+
+      - name: Setup tests
+        run: |
+          pnpm install
+          pnpm run build
+          npm i -g vercel@latest
+          node scripts/run-e2e-test-project-reset.mjs
+
+      - name: Run tests
+        run: |
+          docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.41.2-jammy /bin/bash -c "cd /work && \
+          NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && \ 
+          corepack enable > /dev/null && \
+          NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \
+          DATADOG_API_KEY=${{ env.DATADOG_API_KEY }} \
+          DD_ENV=${{ env.DD_ENV }} \ 
+          VERCEL_TEST_TOKEN=${{ env.VERCEL_TEST_TOKEN }} \
+          VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \
+          NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \
+          NEXT_TEST_MODE=${{ env.NEXT_TEST_MODE }} \
+          TEST_TIMINGS_TOKEN=${{ env.TEST_TIMINGS_TOKEN }} \
+          xvfb-run node run-tests.js --type e2e --timings -g ${{ matrix.group }}/2 -c 1 >> /proc/1/fd/1"
+
+      - name: Save test report as artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-reports
+          if-no-files-found: ignore
+          retention-days: 2
+          path: test/test-junit-report
+
+      - name: Upload test report to Datadog
+        continue-on-error: true
+        run: |
+          pnpx @datadog/datadog-ci@2.23.1 junit upload --tags test.type:nextjs_deploy_e2e --service nextjs ./test/test-junit-report
diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts
@@ -102,7 +102,7 @@ import { AppRouteRouteMatcherProvider } from './future/route-matcher-providers/a
 import { PagesAPIRouteMatcherProvider } from './future/route-matcher-providers/pages-api-route-matcher-provider'
 import { PagesRouteMatcherProvider } from './future/route-matcher-providers/pages-route-matcher-provider'
 import { ServerManifestLoader } from './future/route-matcher-providers/helpers/manifest-loaders/server-manifest-loader'
-import { getTracer, SpanKind } from './lib/trace/tracer'
+import { getTracer, isBubbledError, SpanKind } from './lib/trace/tracer'
 import { BaseServerSpan } from './lib/trace/constants'
 import { I18NProvider } from './future/helpers/i18n-provider'
 import { sendResponse } from './send-response'
@@ -1390,7 +1390,11 @@ export default abstract class Server<
         return this.renderError(null, req, res, '/_error', {})
       }
 
-      if (this.minimalMode || this.renderOpts.dev || (err as any).bubble) {
+      if (
+        this.minimalMode ||
+        this.renderOpts.dev ||
+        (isBubbledError(err) && err.bubble)
+      ) {
         throw err
       }
       this.logError(getProperError(err))
diff --git a/packages/next/src/server/lib/trace/tracer.ts b/packages/next/src/server/lib/trace/tracer.ts
@@ -1,3 +1,4 @@
+import type { FetchEventResult } from '../../web/types'
 import type { SpanTypes } from './constants'
 import { LogSpanAllowList, NextVanillaSpanAllowlist } from './constants'
 
@@ -36,10 +37,22 @@ const isPromise = <T>(p: any): p is Promise<T> => {
   return p !== null && typeof p === 'object' && typeof p.then === 'function'
 }
 
-type BubbledError = Error & { bubble?: boolean }
+export class BubbledError extends Error {
+  constructor(
+    public readonly bubble?: boolean,
+    public readonly result?: FetchEventResult
+  ) {
+    super()
+  }
+}
+
+export function isBubbledError(error: unknown): error is BubbledError {
+  if (typeof error !== 'object' || error === null) return false
+  return error instanceof BubbledError
+}
 
 const closeSpanWithError = (span: Span, error?: Error) => {
-  if ((error as BubbledError | undefined)?.bubble === true) {
+  if (isBubbledError(error) && error.bubble) {
     span.setAttribute('next.bubble', true)
   } else {
     if (error) {
@@ -307,7 +320,7 @@ class NextTracerImpl implements NextTracer {
           }
           try {
             if (fn.length > 1) {
-              return fn(span, (err?: Error) => closeSpanWithError(span, err))
+              return fn(span, (err) => closeSpanWithError(span, err))
             }
 
             const result = fn(span)
diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts
@@ -88,7 +88,7 @@ import {
   INSTRUMENTATION_HOOK_FILENAME,
   RSC_PREFETCH_SUFFIX,
 } from '../lib/constants'
-import { getTracer } from './lib/trace/tracer'
+import { BubbledError, getTracer } from './lib/trace/tracer'
 import { NextNodeServerSpan } from './lib/trace/constants'
 import { nodeFs } from './lib/node-fs-methods'
 import { getRouteRegex } from '../shared/lib/router/utils/route-regex'
@@ -1675,10 +1675,7 @@ export default class NextNodeServer extends BaseServer<
       if ('response' in result) {
         if (isMiddlewareInvoke) {
           bubblingResult = true
-          const err = new Error()
-          ;(err as any).result = result
-          ;(err as any).bubble = true
-          throw err
+          throw new BubbledError(true, result)
         }
 
         for (const [key, value] of Object.entries(
diff --git a/run-tests.js b/run-tests.js
@@ -25,6 +25,8 @@ let argv = require('yargs/yargs')(process.argv.slice(2))
   .string('g')
   .alias('g', 'group')
   .number('c')
+  .boolean('related')
+  .alias('r', 'related')
   .alias('c', 'concurrency').argv
 
 function escapeRegexp(str) {
@@ -197,6 +199,7 @@ async function main() {
     group: argv.group ?? false,
     testPattern: argv.testPattern ?? false,
     type: argv.type ?? false,
+    related: argv.related ?? false,
     retries: argv.retries ?? DEFAULT_NUM_RETRIES,
   }
   let numRetries = options.retries
@@ -232,12 +235,22 @@ async function main() {
   let prevTimings
 
   if (tests.length === 0) {
+    /** @type {RegExp | undefined} */
     let testPatternRegex
 
     if (options.testPattern) {
       testPatternRegex = new RegExp(options.testPattern)
     }
 
+    if (options.related) {
+      const { getRelatedTests } = await import('./scripts/run-related-test.mjs')
+      const tests = await getRelatedTests()
+      if (tests.length)
+        testPatternRegex = new RegExp(tests.map(escapeRegexp).join('|'))
+
+      console.log('Running related tests:', testPatternRegex.toString())
+    }
+
     tests = (
       await glob('**/*.test.{js,ts,tsx}', {
         nodir: true,
diff --git a/scripts/run-related-test.mjs b/scripts/run-related-test.mjs
@@ -19,7 +19,9 @@ async function getChangedFilesFromPackages(baseBranch = 'canary') {
   await exec('git config --global --add safe.directory /work')
   await exec(`git remote set-branches --add origin ${baseBranch}`)
   await exec(`git fetch origin ${baseBranch} --depth=20`)
-  const { stdout } = await exec(`git diff --name-only ${baseBranch}`)
+  const { stdout } = await exec(
+    `git diff 'origin/${baseBranch}...' --name-only`
+  )
   return stdout
     .trim()
     .split('\n')
diff --git a/test/e2e/app-dir/ppr-full/ppr-full.test.ts b/test/e2e/app-dir/ppr-full/ppr-full.test.ts
diff --git a/test/related-tests-manifest.json b/test/related-tests-manifest.json
