ci(workflow): turbopack test upload

vercel · Jun 11, 2023 · aab383d · aab383d
1 parent 4caf4f4
commit aab383d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -148,7 +148,7 @@ jobs:
     secrets: inherit
 
   report-test-results:
-    needs: ['test-dev', 'test-prod', 'test-integration']
+    needs: ['test-dev', 'test-prod', 'test-integration', 'test-turbopack-dev']
     runs-on: [self-hosted, linux, x64]
     name: upload test trace to datadog
     # We'll not block the CI if the upload fails
@@ -157,11 +157,16 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: Test trace reports
-          path: test/test-junit-report
-      - run: |
+          path: test
+      - name: Upload traces
+        run: |
+          ls -al ./test
           npm install -g junit-report-merger @datadog/datadog-ci
           jrm ./nextjs-test-result-junit.xml "test/test-junit-report/**/*.xml"
-          DD_ENV=ci datadog-ci junit upload --git-repository-url https://github.com/vercel/next.js --service nextjs ./nextjs-test-result-junit.xml
+          jrm ./turbopack-test-result-junit.xml "test/turbopack-test-junit-report/**/*.xml"
+          # Put a separate tag for the tests with turbopack to distinguish between same test names
+          DD_ENV=ci datadog-ci junit upload --tags type:nextjs --service nextjs ./nextjs-test-result-junit.xml
+          DD_ENV=ci datadog-ci junit upload --tags type:turbopack --service nextjs ./turbopack-test-result-junit.xml
 
   tests-pass:
     needs:

diff --git a/.github/workflows/build_reusable.yml b/.github/workflows/build_reusable.yml
@@ -133,5 +133,7 @@ jobs:
         if: ${{ inputs.afterBuild }}
         with:
           name: Test trace reports
-          path: test/test-junit-report
+          path: |
+            test/test-junit-report
+            test/turbopack-test-junit-report
           if-no-files-found: ignore
diff --git a/jest.config.js b/jest.config.js
@@ -38,10 +38,14 @@ if (shouldEnableTestTrace) {
   if (!customJestConfig.reporters) {
     customJestConfig.reporters = ['default']
   }
+
+  const outputDirectory = process.env.__INTERNAL_NEXT_DEV_TEST_TURBO_DEV
+    ? '<rootDir>/turbopack-test-junit-report'
+    : '<rootDir>/test-junit-report'
   customJestConfig.reporters.push([
     'jest-junit',
     {
-      outputDirectory: '<rootDir>/test-junit-report',
+      outputDirectory,
       reportTestSuiteErrors: 'true',
       uniqueOutputName: 'true',
       outputName: 'nextjs-test-junit',

diff --git a/test/.gitignore b/test/.gitignore
@@ -2,4 +2,5 @@
 .vscode
 
 e2e/**/tsconfig.json
-test-junit-report/
+test-junit-report/
+turbopack-test-junit-report/