build: clean up verdaccio storage and share storage

Ensures that the Verdaccio registry storage is properly cleaned up at the end of E2E tests by placing it within the main temporary directory which is now explicitly deleted on process exit or SIGINT.

This change also centralizes the Verdaccio storage location, allowing both HTTP and HTTPS Verdaccio instances to share the same storage, simplifying test setup and cleanup. Removes redundant temporary directory creation logic for npm sandbox and temporary project roots, as these are now managed by a single `tmp-root`.

(cherry picked from commit 8335187)

Author: alan-agius4

tests/legacy-cli/e2e/setup/001-create-tmp-dir.ts

@@ -1,24 +1,29 @@
 import { ChildProcess, fork } from 'node:child_process';
 import { on } from 'node:events';
+import { mkdir } from 'node:fs/promises';
 import { join } from 'node:path';
 import { getGlobalVariable } from './env';
 import { writeFile, readFile } from './fs';
-import { mktempd } from './utils';
+import { existsSync } from 'node:fs';
 
 export async function createNpmRegistry(
   port: number,
   httpsPort: number,
   withAuthentication = false,
 ): Promise<ChildProcess> {
   // Setup local package registry
-  const registryPath = await mktempd('angular-cli-e2e-registry-');
+  const registryPath = join(getGlobalVariable('tmp-root'), 'registry');
+  if (!existsSync(registryPath)) {
+    await mkdir(registryPath);
+  }
+
+  const configFileName = withAuthentication ? 'verdaccio_auth.yaml' : 'verdaccio.yaml';
+  let configContent = await readFile(join(__dirname, '../', configFileName));
+  configContent = configContent
+    .replace(/\$\{HTTP_PORT\}/g, String(port))
+    .replace(/\$\{HTTPS_PORT\}/g, String(httpsPort));
+  const configPath = join(registryPath, configFileName);
 
-  let configContent = await readFile(
-    join(__dirname, '../', withAuthentication ? 'verdaccio_auth.yaml' : 'verdaccio.yaml'),
-  );
-  configContent = configContent.replace(/\$\{HTTP_PORT\}/g, String(port));
-  configContent = configContent.replace(/\$\{HTTPS_PORT\}/g, String(httpsPort));
-  const configPath = join(registryPath, 'verdaccio.yaml');
   await writeFile(configPath, configContent);
 
   const verdaccioServer = fork(require.resolve('verdaccio/bin/verdaccio'), ['-c', configPath]);

tests/legacy-cli/e2e/setup/002-npm-sandbox.ts renamed to tests/legacy-cli/e2e/setup/001-npm-sandbox.ts

@@ -15,6 +15,7 @@ import { extractFile } from './e2e/utils/tar';
 import { realpathSync } from 'node:fs';
 import { PkgInfo } from './e2e/utils/packages';
 import { getTestProjectDir } from './e2e/utils/project';
+import { mktempd } from './e2e/utils/utils';
 
 Error.stackTraceLimit = Infinity;
 
@@ -31,13 +32,9 @@ Error.stackTraceLimit = Infinity;
  *   --ng-snapshots    Install angular snapshot builds in the test project.
  *   --glob            Run tests matching this glob pattern (relative to tests/e2e/).
  *   --ignore          Ignore tests matching this glob pattern.
- *   --reuse=/path     Use a path instead of create a new project. That project should have been
- *                     created, and npm installed. Ideally you want a project created by a previous
- *                     run of e2e.
  *   --nb-shards       Total number of shards that this is part of. Default is 2 if --shard is
  *                     passed in.
  *   --shard           Index of this processes' shard.
- *   --tmpdir=path     Override temporary directory to use for new projects.
  *   --package-manager Package manager to use.
  *   --package=path    An npm package to be published before running tests
  *
@@ -58,8 +55,6 @@ const parsed = parseArgs({
     'nosilent': { type: 'boolean' },
     'package': { type: 'string', multiple: true, default: ['./dist/_*.tgz'] },
     'package-manager': { type: 'string', default: 'npm' },
-    'reuse': { type: 'string' },
-    'tmpdir': { type: 'string' },
     'verbose': { type: 'boolean' },
 
     'nb-shards': { type: 'string' },
@@ -227,65 +222,68 @@ process.env.CHROME_BIN = path.resolve(process.env.CHROME_BIN!);
 process.env.CHROME_PATH = path.resolve(process.env.CHROME_PATH!);
 process.env.CHROMEDRIVER_BIN = path.resolve(process.env.CHROMEDRIVER_BIN!);
 
-Promise.all([findFreePort(), findFreePort(), findPackageTars()])
-  .then(async ([httpPort, httpsPort, packageTars]) => {
-    setGlobalVariable('package-registry', 'http://localhost:' + httpPort);
-    setGlobalVariable('package-secure-registry', 'http://localhost:' + httpsPort);
-    setGlobalVariable('package-tars', packageTars);
-
-    // NPM registries for the lifetime of the test execution
-    const registryProcess = await createNpmRegistry(httpPort, httpPort);
-    const secureRegistryProcess = await createNpmRegistry(httpPort, httpsPort, true);
-
-    try {
-      await runSteps(runSetup, allSetups, 'setup');
-      await runSteps(runInitializer, allInitializers, 'initializer');
-      await runSteps(runTest, testsToRun, 'test');
-
-      if (shardId !== null) {
-        console.log(colors.green(`Done shard ${shardId} of ${nbShards}.`));
-      } else {
-        console.log(colors.green('Done.'));
-      }
+(async () => {
+  const tempRoot = await mktempd('angular-cli-e2e-', process.env.E2E_TEMP);
+  setGlobalVariable('tmp-root', tempRoot);
+
+  process.on('SIGINT', deleteTemporaryRoot);
+  process.on('exit', deleteTemporaryRoot);
+
+  const [httpPort, httpsPort, packageTars] = await Promise.all([
+    findFreePort(),
+    findFreePort(),
+    findPackageTars(),
+  ]);
+  setGlobalVariable('package-registry', 'http://localhost:' + httpPort);
+  setGlobalVariable('package-secure-registry', 'http://localhost:' + httpsPort);
+  setGlobalVariable('package-tars', packageTars);
+
+  // NPM registries for the lifetime of the test execution
+  const registryProcess = await createNpmRegistry(httpPort, httpPort);
+  const secureRegistryProcess = await createNpmRegistry(httpPort, httpsPort, true);
+
+  try {
+    console.log(`  Using "${tempRoot}" as temporary directory for a new project.`);
+
+    await runSteps(runSetup, allSetups, 'setup');
+    await runSteps(runInitializer, allInitializers, 'initializer');
+    await runSteps(runTest, testsToRun, 'test');
+
+    if (shardId !== null) {
+      console.log(colors.green(`Done shard ${shardId} of ${nbShards}.`));
+    } else {
+      console.log(colors.green('Done.'));
+    }
 
-      process.exitCode = 0;
-    } catch (err) {
-      if (err instanceof Error) {
-        console.log('\n');
-        console.error(colors.red(err.message));
-        if (err.stack) {
-          console.error(colors.red(err.stack));
-        }
-      } else {
-        console.error(colors.red(String(err)));
+    process.exitCode = 0;
+  } catch (err) {
+    if (err instanceof Error) {
+      console.log('\n');
+      console.error(colors.red(err.message));
+      if (err.stack) {
+        console.error(colors.red(err.stack));
       }
+    } else {
+      console.error(colors.red(String(err)));
+    }
 
-      if (argv.debug) {
-        console.log(`Current Directory: ${process.cwd()}`);
-        console.log('Will loop forever while you debug... CTRL-C to quit.');
-
-        // Wait forever until user explicitly cancels.
-        await new Promise(() => {});
-      }
+    if (argv.debug) {
+      console.log(`Current Directory: ${process.cwd()}`);
+      console.log('Will loop forever while you debug... CTRL-C to quit.');
 
-      process.exitCode = 1;
-    } finally {
-      registryProcess.kill();
-      secureRegistryProcess.kill();
-
-      await rm(getGlobalVariable('projects-root'), {
-        recursive: true,
-        force: true,
-        maxRetries: 3,
-      }).catch(() => {
-        // If this fails it is not fatal.
-      });
+      // Wait forever until user explicitly cancels.
+      await new Promise(() => {});
     }
-  })
-  .catch((err) => {
-    console.error(colors.red(`Unkown Error: ${err}`));
+
     process.exitCode = 1;
-  });
+  } finally {
+    registryProcess.kill();
+    secureRegistryProcess.kill();
+  }
+})().catch((err) => {
+  console.error(colors.red(`Unkown Error: ${err}`));
+  process.exitCode = 1;
+});
 
 async function runSteps(
   run: (name: string) => Promise<void> | void,
@@ -415,3 +413,13 @@ async function findPackageTars(): Promise<{ [pkg: string]: PkgInfo }> {
     {} as { [pkg: string]: PkgInfo },
   );
 }
+
+function deleteTemporaryRoot(): void {
+  try {
+    fs.rmSync(getGlobalVariable('tmp-root'), {
+      recursive: true,
+      force: true,
+      maxRetries: 3,
+    });
+  } catch {}
+}