Skip to content

Commit

Permalink
Skip test/integration in Turbopack build runs (#63480)
Browse files Browse the repository at this point in the history
## What?

We need to go through all `test/integration` tests to make sure they're
only running the production piece.

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the
PR.
- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->


Closes NEXT-2866
  • Loading branch information
timneutkens authored Mar 19, 2024
1 parent 14f16c7 commit d2c28ee
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 49 deletions.
97 changes: 50 additions & 47 deletions .github/workflows/turbopack-nextjs-build-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,55 +94,57 @@ jobs:
path: |
test/turbopack-test-junit-report
test-integration-production:
name: Next.js production integration test (Integration)
needs: [setup_nextjs]
runs-on:
- 'self-hosted'
- 'linux'
- 'x64'
- 'metal'

timeout-minutes: 180
strategy:
fail-fast: false
matrix:
group: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]

steps:
- uses: actions/cache/restore@v3
id: restore-build
with:
path: ./*
key: ${{ inputs.version }}-${{ github.sha }}
fail-on-cache-miss: true

- name: Enable corepack and install yarn
run: |
corepack enable
corepack prepare --activate yarn@1.22.19
- name: Setup playwright
run: |
pnpm playwright install
- name: Run test/integration
run: |
TURBOPACK=1 TURBOPACK_BUILD=1 node run-tests.js -g ${{ matrix.group }}/12 -c ${TEST_CONCURRENCY} --type integration
continue-on-error: true

- name: Upload test report artifacts
uses: actions/upload-artifact@v4
with:
name: test-reports-build-integration-${{ matrix.group }}
if-no-files-found: 'error'
path: |
test/turbopack-test-junit-report
# TODO: Implement specifically running production tests only for Turbopack. Enabling this now enables running `test/integration` with development mode too.
# test-integration-production:
# name: Next.js production integration test (Integration)
# needs: [setup_nextjs]
# runs-on:
# - 'self-hosted'
# - 'linux'
# - 'x64'
# - 'metal'

# timeout-minutes: 180
# strategy:
# fail-fast: false
# matrix:
# group: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]

# steps:
# - uses: actions/cache/restore@v3
# id: restore-build
# with:
# path: ./*
# key: ${{ inputs.version }}-${{ github.sha }}
# fail-on-cache-miss: true

# - name: Enable corepack and install yarn
# run: |
# corepack enable
# corepack prepare --activate yarn@1.22.19

# - name: Setup playwright
# run: |
# pnpm playwright install

# - name: Run test/integration
# run: |
# TURBOPACK=1 TURBOPACK_BUILD=1 node run-tests.js -g ${{ matrix.group }}/12 -c ${TEST_CONCURRENCY} --type integration
# continue-on-error: true

# - name: Upload test report artifacts
# uses: actions/upload-artifact@v4
# with:
# name: test-reports-build-integration-${{ matrix.group }}
# if-no-files-found: 'error'
# path: |
# test/turbopack-test-junit-report

# Collect integration test results from execute_tests,
# Store it as github artifact for next step to consume.
collect_nextjs_production_integration_stat:
needs: [test-production, test-integration-production]
# needs: [test-production, test-integration-production]
needs: [test-production]
name: Next.js integration test production status report
runs-on:
- 'self-hosted'
Expand All @@ -165,14 +167,15 @@ jobs:
- name: Store artifacts
uses: actions/upload-artifact@v4
with:
name: test-results-build
name: test-results-turbopack-production
path: |
nextjs-test-results.json
failed-test-path-list.json
passed-test-path-list.json
upload_test_report:
needs: [test-production, test-integration-production]
# needs: [test-production, test-integration-production]
needs: [test-production]
name: Upload test report to datadog
runs-on:
- 'self-hosted'
Expand Down
23 changes: 21 additions & 2 deletions test/build-turbopack-build-tests-manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ async function fetchLatestTestArtifact() {
const { stdout } = await exec(
'Getting latest test artifacts from GitHub actions',
'gh',
['api', '/repos/vercel/next.js/actions/artifacts?name=test-results-build']
[
'api',
'/repos/vercel/next.js/actions/artifacts?name=test-results-turbopack-production',
]
)

/** @type {ListArtifactsResponse} */
Expand Down Expand Up @@ -250,7 +253,23 @@ async function updatePassingTests() {

fs.writeFileSync(
PASSING_JSON_PATH,
await format(JSON.stringify(ordered, null, 2))
await format(
JSON.stringify(
{
version: 2,
suites: ordered,
rules: {
include: [
'test/e2e/**/*.test.{t,j}s{,x}',
'test/production/**/*.test.{t,j}s{,x}',
],
exclude: [],
},
},
null,
2
)
)
)
}

Expand Down

0 comments on commit d2c28ee

Please sign in to comment.