From c65ec28bbb162abe45cea98f67f17164e24ef871 Mon Sep 17 00:00:00 2001
From: Nikola Jokic <nikola-jokic@github.com>
Date: Fri, 3 Jun 2022 16:01:24 +0200
Subject: [PATCH] added force cleanup for network and cleanUp hook is cleaning
 up based on the label

---
 packages/docker/src/dockerCommands/container.ts |  1 +
 packages/docker/tests/cleanup-job-test.ts       | 13 +++----------
 packages/docker/tests/container-pull-test.ts    |  2 +-
 packages/docker/tests/e2e-test.ts               | 16 ++++++++--------
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/packages/docker/src/dockerCommands/container.ts b/packages/docker/src/dockerCommands/container.ts
index d1ad5c3..e47fc84 100644
--- a/packages/docker/src/dockerCommands/container.ts
+++ b/packages/docker/src/dockerCommands/container.ts
@@ -175,6 +175,7 @@ export async function containerNetworkPrune(): Promise<void> {
   const dockerArgs = [
     'network',
     'prune',
+    '--force',
     '--filter',
     `label=${getRunnerLabel()}`
   ]
diff --git a/packages/docker/tests/cleanup-job-test.ts b/packages/docker/tests/cleanup-job-test.ts
index efee5b0..a9cf3fe 100644
--- a/packages/docker/tests/cleanup-job-test.ts
+++ b/packages/docker/tests/cleanup-job-test.ts
@@ -1,7 +1,7 @@
-import { prepareJob, cleanupJob } from '../src/hooks'
-import { v4 as uuidv4 } from 'uuid'
 import * as fs from 'fs'
 import * as path from 'path'
+import { v4 as uuidv4 } from 'uuid'
+import { cleanupJob, prepareJob } from '../src/hooks'
 import TestSetup from './test-setup'
 
 const prepareJobInputPath = path.resolve(
@@ -50,13 +50,6 @@ describe('cleanup job', () => {
   })
 
   it('should cleanup successfully', async () => {
-    const prepareJobOutputContent = fs.readFileSync(
-      prepareJobOutputPath,
-      'utf-8'
-    )
-    const parsedPrepareJobOutput = JSON.parse(prepareJobOutputContent)
-    await expect(
-      cleanupJob(prepareJobData.args, parsedPrepareJobOutput.state, null)
-    ).resolves.not.toThrow()
+    await expect(cleanupJob()).resolves.not.toThrow()
   })
 })
diff --git a/packages/docker/tests/container-pull-test.ts b/packages/docker/tests/container-pull-test.ts
index 77bb5cb..bab1cae 100644
--- a/packages/docker/tests/container-pull-test.ts
+++ b/packages/docker/tests/container-pull-test.ts
@@ -4,7 +4,7 @@ jest.useRealTimers()
 
 describe('container pull', () => {
   it('should fail', async () => {
-    const arg = { image: 'doesNotExist' }
+    const arg = { image: 'does-not-exist' }
     await expect(containerPull(arg.image, '')).rejects.toThrow()
   })
   it('should succeed', async () => {
diff --git a/packages/docker/tests/e2e-test.ts b/packages/docker/tests/e2e-test.ts
index cdc889b..e1e02ab 100644
--- a/packages/docker/tests/e2e-test.ts
+++ b/packages/docker/tests/e2e-test.ts
@@ -1,12 +1,12 @@
-import {
-  prepareJob,
-  cleanupJob,
-  runScriptStep,
-  runContainerStep
-} from '../src/hooks'
 import * as fs from 'fs'
 import * as path from 'path'
 import { v4 as uuidv4 } from 'uuid'
+import {
+  cleanupJob,
+  prepareJob,
+  runContainerStep,
+  runScriptStep
+} from '../src/hooks'
 import TestSetup from './test-setup'
 
 const prepareJobJson = fs.readFileSync(
@@ -83,7 +83,7 @@ describe('e2e', () => {
     await expect(
       runContainerStep(containerStepData.args, resp.state)
     ).resolves.not.toThrow()
-    await expect(cleanupJob(resp, resp.state, null)).resolves.not.toThrow()
+    await expect(cleanupJob()).resolves.not.toThrow()
   })
 
   it('should prepare job, then run script step, then run container step with Dockerfile then cleanup', async () => {
@@ -112,6 +112,6 @@ ENTRYPOINT [ "tail", "-f", "/dev/null" ]
     await expect(
       runContainerStep(containerStepDataCopy.args, resp.state)
     ).resolves.not.toThrow()
-    await expect(cleanupJob(resp, resp.state, null)).resolves.not.toThrow()
+    await expect(cleanupJob()).resolves.not.toThrow()
   })
 })