chore(repo): use same cleanup function for lerna e2e (#14747)

e2e/lerna-smoke-tests/src/lerna-smoke-tests.test.ts

@@ -4,7 +4,7 @@
  */
 
 import {
-  cleanupLernaWorkspace,
+  cleanupProject,
   newLernaWorkspace,
   runLernaCLI,
   tmpProjPath,
@@ -32,7 +32,7 @@ expect.addSnapshotSerializer({
 
 describe('Lerna Smoke Tests', () => {
   beforeAll(() => newLernaWorkspace());
-  afterAll(() => cleanupLernaWorkspace());
+  afterAll(() => cleanupProject({ skipReset: true }));
 
   // `lerna repair` builds on top of `nx repair` and runs all of its generators
   describe('lerna repair', () => {

e2e/utils/index.ts

@@ -511,18 +511,15 @@ export async function killPorts(port?: number): Promise<boolean> {
 }
 
 // Useful in order to cleanup space during CI to prevent `No space left on device` exceptions
-export async function cleanupProject(opts?: RunCmdOpts) {
+export function cleanupProject({
+  skipReset,
+  ...opts
+}: RunCmdOpts & { skipReset?: boolean } = {}) {
   if (isCI) {
     // Stopping the daemon is not required for tests to pass, but it cleans up background processes
-    runCLI('reset', opts);
-    try {
-      removeSync(tmpProjPath());
-    } catch (e) {}
-  }
-}
-
-export function cleanupLernaWorkspace() {
-  if (isCI) {
+    if (!skipReset) {
+      runCLI('reset', opts);
+    }
     try {
       removeSync(tmpProjPath());
     } catch (e) {}