chore(repo): parallelize e2e-ci tasks on large/xlarge agents

.nx/workflows/dynamic-changesets.yaml

@@ -5,31 +5,6 @@ distribute-on:
   large-changeset: 6 linux-large, 6 linux-extra-large
   extra-large-changeset: 8 linux-large, 8 linux-extra-large
 assignment-rules:
-  - projects:
-      - e2e-gradle
-    targets:
-      - e2e-ci**
-    run-on:
-      - agent: linux-extra-large
-        parallelism: 1
-  - projects:
-      - e2e-next
-      - e2e-plugin
-    targets:
-      - e2e-ci**
-    run-on:
-      - agent: linux-extra-large
-        parallelism: 2
-  - projects:
-      - e2e-angular
-      - e2e-node
-      - e2e-react
-    targets:
-      - e2e-ci**
-    run-on:
-      - agent: linux-extra-large
-        parallelism: 1
-
   - projects:
       - nx
       - workspace
@@ -44,36 +19,13 @@ assignment-rules:
       - agent: linux-extra-large
         parallelism: 1
 
-  - projects:
-      - e2e-release
-      - e2e-nuxt
-      - e2e-web
-      - e2e-eslint
-      - e2e-remix
-      - e2e-cypress
-      - e2e-docker
-      - e2e-js
-      - e2e-nx
-      - e2e-nx-init
-      - e2e-dotnet
-      - e2e-workspace-create
-      - e2e-rollup
-    targets:
-      - e2e-ci**
-    run-on:
-      - agent: linux-large
-        parallelism: 1
-      - agent: linux-extra-large
-        parallelism: 2
-
-  # All other e2e tests can run in parallel
   - targets:
       - e2e-ci**
     run-on:
       - agent: linux-large
         parallelism: 2
       - agent: linux-extra-large
-        parallelism: 3
+        parallelism: 4
 
   - targets:
       - bench:*

e2e/angular/src/module-federation-host-remote.test.ts

@@ -2,6 +2,7 @@ import { names } from '@nx/devkit';
 import {
   checkFilesExist,
   killProcessAndPorts,
+  reservePort,
   runCLI,
   runCommandUntil,
   uniq,
@@ -30,12 +31,12 @@ describe('Angular Module Federation - Host and Remote', () => {
     const sharedLib = uniq('shared-lib');
     const wildcardLib = uniq('wildcard-lib');
     const secondaryEntry = uniq('secondary');
-    const hostPort = 4300;
-    const remotePort = 4301;
+    const hostPort = await reservePort();
+    const remotePort = await reservePort();
 
     // generate host app
     runCLI(
-      `generate @nx/angular:host ${hostApp} --style=css --no-standalone --unitTestRunner=jest --no-interactive`
+      `generate @nx/angular:host ${hostApp} --port=${hostPort} --style=css --no-standalone --unitTestRunner=jest --no-interactive`
     );
     // generate remote app
     runCLI(
@@ -152,15 +153,15 @@ describe('Angular Module Federation - Host and Remote', () => {
       `serve ${hostApp} --port=${hostPort} --dev-remotes=${remoteApp1}`,
       (output) =>
         !output.includes(`Remote '${remoteApp1}' failed to serve correctly`) &&
-        output.includes(`listening on localhost:${hostPort}`)
+        output.includes(`server ready at http://localhost:${hostPort}`)
     );
     await killProcessAndPorts(processSwc.pid, hostPort, remotePort);
 
     const processTsNode = await runCommandUntil(
       `serve ${hostApp} --port=${hostPort} --dev-remotes=${remoteApp1}`,
       (output) =>
         !output.includes(`Remote '${remoteApp1}' failed to serve correctly`) &&
-        output.includes(`listening on localhost:${hostPort}`),
+        output.includes(`server ready at http://localhost:${hostPort}`),
       { env: { NX_PREFER_TS_NODE: 'true' } }
     );
 
@@ -170,8 +171,8 @@ describe('Angular Module Federation - Host and Remote', () => {
   it('should convert apps to MF successfully', async () => {
     const app1 = uniq('app1');
     const app2 = uniq('app2');
-    const app1Port = 4400;
-    const app2Port = 4401;
+    const app1Port = await reservePort();
+    const app2Port = await reservePort();
 
     // generate apps
     runCLI(
@@ -193,7 +194,7 @@ describe('Angular Module Federation - Host and Remote', () => {
       `serve ${app1} --dev-remotes=${app2}`,
       (output) =>
         !output.includes(`Remote '${app2}' failed to serve correctly`) &&
-        output.includes(`listening on localhost:${app1Port}`)
+        output.includes(`server ready at http://localhost:${app1Port}`)
     );
 
     await killProcessAndPorts(processSwc.pid, app1Port, app2Port);
@@ -202,7 +203,7 @@ describe('Angular Module Federation - Host and Remote', () => {
       `serve ${app1} --dev-remotes=${app2}`,
       (output) =>
         !output.includes(`Remote '${app2}' failed to serve correctly`) &&
-        output.includes(`listening on localhost:${app1Port}`),
+        output.includes(`server ready at http://localhost:${app1Port}`),
       { env: { NX_PREFER_TS_NODE: 'true' } }
     );
 

e2e/angular/src/module-federation-lib.test.ts

@@ -1,5 +1,6 @@
 import {
   killProcessAndPorts,
+  reservePort,
   runCLI,
   runCommandUntil,
   runE2ETests,
@@ -27,10 +28,10 @@ describe('Angular Module Federation - Federated Libraries', () => {
     const module = uniq('module');
     const host = uniq('host');
 
-    const hostPort = 4200;
+    const hostPort = await reservePort();
 
     runCLI(
-      `generate @nx/angular:host ${host} --remotes=${remote} --e2eTestRunner=cypress --no-interactive`
+      `generate @nx/angular:host ${host} --port=${hostPort} --remotes=${remote} --e2eTestRunner=cypress --no-interactive`
     );
 
     runCLI(`generate @nx/js:lib ${lib} --no-interactive`);
@@ -101,10 +102,10 @@ describe('Angular Module Federation - Federated Libraries', () => {
     const childRemote = uniq('childremote');
     const module = uniq('module');
     const host = uniq('host');
-    const hostPort = 4200;
+    const hostPort = await reservePort();
 
     runCLI(
-      `generate @nx/angular:host ${host} --remotes=${remote} --e2eTestRunner=cypress --no-interactive`
+      `generate @nx/angular:host ${host} --port=${hostPort} --remotes=${remote} --e2eTestRunner=cypress --no-interactive`
     );
 
     runCLI(`generate @nx/js:lib ${lib} --no-interactive`);

e2e/angular/src/module-federation-ssr.test.ts

@@ -3,6 +3,7 @@ import {
   killPorts,
   killProcessAndPorts,
   readJson,
+  reservePort,
   runCLI,
   runCommandUntil,
   runE2ETests,
@@ -40,13 +41,14 @@ describe('Angular Module Federation - SSR', () => {
     const remote1 = uniq('remote1');
     const remote2 = uniq('remote2');
 
+    // ports
+    const hostPort = await reservePort();
+
     // generate remote apps
     runCLI(
-      `generate @nx/angular:host ${host} --ssr --remotes=${remote1},${remote2} --no-interactive`
+      `generate @nx/angular:host ${host} --port=${hostPort} --ssr --remotes=${remote1},${remote2} --no-interactive`
     );
 
-    // ports
-    const hostPort = 4500;
     const remote1Port = readJson(join(remote1, 'project.json')).targets.serve
       .options.port;
     const remote2Port = readJson(join(remote2, 'project.json')).targets.serve

e2e/angular/src/module-federation.rspack.test.ts

@@ -5,6 +5,7 @@ import {
   killProcessAndPorts,
   newProject,
   readFile,
+  reservePort,
   runCLI,
   runCommandUntil,
   runE2ETests,
@@ -34,12 +35,12 @@ describe('Angular Module Federation', () => {
     const sharedLib = uniq('shared-lib');
     const wildcardLib = uniq('wildcard-lib');
     const secondaryEntry = uniq('secondary');
-    const hostPort = 4300;
-    const remotePort = 4301;
+    const hostPort = await reservePort();
+    const remotePort = await reservePort();
 
     // generate host app
     runCLI(
-      `generate @nx/angular:host ${hostApp} --style=css --bundler=rspack --no-standalone --no-interactive`
+      `generate @nx/angular:host ${hostApp} --port=${hostPort} --style=css --bundler=rspack --no-standalone --no-interactive`
     );
     let rspackConfigFileContents = readFile(join(hostApp, 'rspack.config.ts'));
     let updatedConfigFileContents = rspackConfigFileContents.replace(
@@ -179,12 +180,12 @@ describe('Angular Module Federation', () => {
   it('should load remote app in the browser via ESM module federation', async () => {
     const hostApp = uniq('host');
     const remoteApp = uniq('remote');
-    const hostPort = 4200;
-    const remotePort = 4401;
+    const hostPort = await reservePort();
+    const remotePort = await reservePort();
 
     // generate host with playwright e2e runner
     runCLI(
-      `generate @nx/angular:host ${hostApp} --style=css --bundler=rspack --e2eTestRunner=playwright --no-interactive`
+      `generate @nx/angular:host ${hostApp} --port=${hostPort} --style=css --bundler=rspack --e2eTestRunner=playwright --no-interactive`
     );
 
     // generate remote

e2e/angular/src/projects-build-and-test.test.ts

@@ -5,6 +5,7 @@ import {
   killPort,
   killProcessAndPorts,
   readFile,
+  reservePort,
   runCLI,
   runCommandUntil,
   runE2ETests,
@@ -95,7 +96,7 @@ describe('Angular Projects - Build and Test', () => {
       expect(await killPort(4200)).toBeTruthy();
     }
 
-    const appPort = 4207;
+    const appPort = await reservePort();
     const process = await runCommandUntil(
       `serve ${app1} -- --port=${appPort}`,
       (output) => output.includes(`listening on localhost:${appPort}`)

e2e/gradle/src/utils/create-gradle-project.ts

@@ -28,14 +28,21 @@ export function createGradleProject(
         cwd,
       })
   );
+  // Run setup-time gradle commands with --no-daemon so we don't leave a
+  // long-lived daemon holding inotify watches on the project dir. A daemon
+  // spawned here outlives the setup phase and interferes with later
+  // non-gradle filesystem operations (e.g. `nx import` runs `git
+  // filter-branch --tree-filter`, which fails with "Unable to read current
+  // working directory" when the daemon is concurrently watching the same
+  // tree). The actual test-body gradle calls keep daemons enabled.
   e2eConsoleLogger(
-    execSync(`${gradleCommand} help --task :init`, {
+    execSync(`${gradleCommand} help --task :init --no-daemon`, {
       cwd,
     }).toString()
   );
   e2eConsoleLogger(
     runCommand(
-      `${gradleCommand} init --type ${type}-application --dsl ${type} --project-name ${projectName} --package ${packageName} --no-incubating --split-project --overwrite`,
+      `${gradleCommand} init --type ${type}-application --dsl ${type} --project-name ${projectName} --package ${packageName} --no-incubating --split-project --overwrite --no-daemon`,
       {
         cwd,
       }
@@ -53,12 +60,7 @@ export function createGradleProject(
 
   try {
     e2eConsoleLogger(
-      runCommand(`${gradleCommand} --stop`, {
-        cwd,
-      })
-    );
-    e2eConsoleLogger(
-      runCommand(`${gradleCommand} clean`, {
+      runCommand(`${gradleCommand} clean --no-daemon`, {
         cwd,
       })
     );

e2e/next/src/next-legacy.test.ts

@@ -9,6 +9,7 @@ import {
   newProject,
   packageManagerLockFile,
   readFile,
+  reservePort,
   runCLI,
   runCommand,
   runCommandUntil,
@@ -77,7 +78,7 @@ describe('@nx/next (legacy)', () => {
     checkFilesExist(`dist/${appName}/nested/headers-2.js`);
   }, 120_000);
 
-  it('should build and install pruned lock file', () => {
+  it('should build and install pruned lock file', async () => {
     const appName = uniq('app');
     runCLI(`generate @nx/next:app ${appName} --no-interactive --style=css`, {
       env: { NX_ADD_PLUGINS: 'false' },
@@ -250,7 +251,7 @@ describe('@nx/next (legacy)', () => {
     expect(nextConfigPath).not.toContain(`require("@nx/`); // dev-only packages
 
     // Check that `nx serve <app> --prod` works with previous production build (e.g. `nx build <app>`).
-    const prodServePort = 4001;
+    const prodServePort = await reservePort();
     const prodServeProcess = await runCommandUntil(
       `run ${appName}:serve --prod --port=${prodServePort}`,
       (output) => {
@@ -259,7 +260,7 @@ describe('@nx/next (legacy)', () => {
     );
 
     // Check that the output is self-contained (i.e. can run with its own package.json + node_modules)
-    const selfContainedPort = 3000;
+    const selfContainedPort = await reservePort();
     runCLI(
       `generate @nx/workspace:run-commands serve-prod --project ${appName} --cwd=dist/packages/${appName} --command="npx next start --port=${selfContainedPort}"`,
       {