From 903a125fabbaba7e76ac4c10a15242c73824295a Mon Sep 17 00:00:00 2001
From: Frostebite <jas.f.ukcmti@gmail.com>
Date: Thu, 19 Jan 2023 03:33:25 +0000
Subject: [PATCH] parameterize s3

---
 .github/workflows/cloud-runner-pipeline.yml                 | 1 -
 .../tests/cloud-runner-run-twice-caching.test.ts            | 6 ++++++
 .../tests/cloud-runner-run-twice-retaining.test.ts          | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cloud-runner-pipeline.yml b/.github/workflows/cloud-runner-pipeline.yml
index 1da0cd97..4401c857 100644
--- a/.github/workflows/cloud-runner-pipeline.yml
+++ b/.github/workflows/cloud-runner-pipeline.yml
@@ -74,7 +74,6 @@ jobs:
           CLOUD_RUNNER_CLUSTER: ${{ matrix.cloudRunnerCluster }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: yarn run test "cloud-runner-run-twice-retaining" --detectOpenHandles --forceExit --runInBand
-        if: matrix.CloudRunnerCluster == 'aws' || matrix.CloudRunnerCluster == 'k8s'
         timeout-minutes: 180
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
diff --git a/src/model/cloud-runner/tests/cloud-runner-run-twice-caching.test.ts b/src/model/cloud-runner/tests/cloud-runner-run-twice-caching.test.ts
index f5e730c9..d93551b6 100644
--- a/src/model/cloud-runner/tests/cloud-runner-run-twice-caching.test.ts
+++ b/src/model/cloud-runner/tests/cloud-runner-run-twice-caching.test.ts
@@ -6,6 +6,7 @@ import CloudRunnerLogger from '../services/cloud-runner-logger';
 import { v4 as uuidv4 } from 'uuid';
 import CloudRunnerOptions from '../cloud-runner-options';
 import setups from './cloud-runner-suite.test';
+import * as fs from 'fs';
 
 async function CreateParameters(overrides) {
   if (overrides) {
@@ -45,6 +46,11 @@ describe('Cloud Runner Caching', () => {
       expect(results).not.toContain(cachePushFail);
 
       CloudRunnerLogger.log(`run 1 succeeded`);
+
+      if (CloudRunnerOptions.cloudRunnerCluster === `local-docker`) {
+        const cacheFolderExists = fs.existsSync(`cloud-runner-cache/cache/${overrides.cacheKey}`);
+        expect(cacheFolderExists).toBeTruthy();
+      }
       const buildParameter2 = await CreateParameters(overrides);
 
       buildParameter2.cacheKey = buildParameter.cacheKey;
diff --git a/src/model/cloud-runner/tests/cloud-runner-run-twice-retaining.test.ts b/src/model/cloud-runner/tests/cloud-runner-run-twice-retaining.test.ts
index a87be9e2..a0d5d60d 100644
--- a/src/model/cloud-runner/tests/cloud-runner-run-twice-retaining.test.ts
+++ b/src/model/cloud-runner/tests/cloud-runner-run-twice-retaining.test.ts
@@ -6,7 +6,6 @@ import CloudRunnerLogger from '../services/cloud-runner-logger';
 import { v4 as uuidv4 } from 'uuid';
 import CloudRunnerOptions from '../cloud-runner-options';
 import setups from './cloud-runner-suite.test';
-import { CloudRunnerSystem } from '../services/cloud-runner-system';
 import * as fs from 'fs';
 import path from 'path';
 import { CloudRunnerFolders } from '../services/cloud-runner-folders';
@@ -47,7 +46,8 @@ describe('Cloud Runner Retain Workspace', () => {
       expect(results).not.toContain(cachePushFail);
 
       if (CloudRunnerOptions.cloudRunnerCluster === `local-docker`) {
-        CloudRunnerSystem.Run(`tree cloud-runner-cache -L 2 `);
+        const cacheFolderExists = fs.existsSync(`cloud-runner-cache/cache/${overrides.cacheKey}`);
+        expect(cacheFolderExists).toBeTruthy();
       }
 
       CloudRunnerLogger.log(`run 1 succeeded`);