ci: add tests for Unity 6 and build profiles

add new `buildProfile` action param, which will be passed into
Unity as the `-activeBuildProfile ...` CLI param.

closes https://github.com/game-ci/unity-builder/issues/674

.eslintrc.json

@@ -1,5 +1,4 @@
 {
-  "root": true,
   "plugins": ["jest", "@typescript-eslint", "prettier", "unicorn"],
   "extends": ["plugin:unicorn/recommended", "plugin:github/recommended", "plugin:prettier/recommended"],
   "parser": "@typescript-eslint/parser",
@@ -15,8 +14,7 @@
   "env": {
     "node": true,
     "es6": true,
-    "jest/globals": true,
+    "jest/globals": true
-    "es2020": true
   },
   "rules": {
     // Error out for code formatting errors
@@ -79,13 +77,5 @@
     "unicorn/prefer-spread": "off",
     // Temp disable to prevent mixing changes with other PRs
     "i18n-text/no-en": "off"
-  },
+  }
-  "overrides": [
-    {
-      "files": ["jest.setup.js"],
-      "rules": {
-        "import/no-commonjs": "off"
-      }
-    }
-  ]
 }

.github/workflows/build-tests-mac.yml

@@ -12,26 +12,18 @@ jobs:
   buildForAllPlatformsMacOS:
     name: ${{ matrix.targetPlatform }} on ${{ matrix.unityVersion }}
     runs-on: macos-latest
-    continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
         projectPath:
           - test-project
         unityVersion:
-          - 2021.3.45f1
+          - 2021.3.32f1
           - 2022.3.13f1
           - 2023.2.2f1
         targetPlatform:
           - StandaloneOSX # Build a MacOS executable
           - iOS # Build an iOS executable
-        include:
-          # Additionally test enableGpu build for a standalone windows target
-          - unityVersion: 6000.0.36f1
-            targetPlatform: StandaloneOSX
-          - unityVersion: 6000.0.36f1
-            targetPlatform: StandaloneOSX
-            buildProfile: 'Assets/Settings/Build Profiles/Sample macOS Build Profile.asset'
 
     steps:
       ###########################
@@ -73,7 +65,6 @@ jobs:
           projectPath: ${{ matrix.projectPath }}
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
-          buildProfile: ${{ matrix.buildProfile }}
           customParameters: -profile SomeProfile -someBoolean -someValue exampleValue
           # We use dirty build because we are replacing the default project settings file above
           allowDirtyBuild: true
@@ -83,6 +74,6 @@ jobs:
       ###########################
       - uses: actions/upload-artifact@v4
         with:
-          name: Build ${{ matrix.targetPlatform }} on MacOS (${{ matrix.unityVersion }})${{ matrix.buildProfile && '  With Build Profile' || '' }}
+          name: Build ${{ matrix.targetPlatform }} on MacOS (${{ matrix.unityVersion }})
           path: build
           retention-days: 14

.github/workflows/build-tests-windows.yml

@@ -26,20 +26,7 @@ jobs:
           - StandaloneWindows64 # Build a Windows 64-bit standalone.
           - WSAPlayer # Build a UWP App
           - tvOS # Build an Apple TV XCode project
-        enableGpu:
+
-          - false
-        include:
-          # Additionally test enableGpu build for a standalone windows target
-          - projectPath: test-project
-            unityVersion: 2023.2.2f1
-            targetPlatform: StandaloneWindows64
-            enableGpu: true
-          - unityVersion: 6000.0.36f1
-            targetPlatform: StandaloneWindows64
-          - unityVersion: 6000.0.36f1
-            targetPlatform: StandaloneWindows64
-            buildProfile: 'Assets/Settings/Build Profiles/Sample Windows Build Profile.asset'
-  
     steps:
       ###########################
       #         Checkout        #
@@ -84,8 +71,6 @@ jobs:
           projectPath: ${{ matrix.projectPath }}
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
-          buildProfile: ${{ matrix.buildProfile }}
-          enableGpu: ${{ matrix.enableGpu }}
           customParameters: -profile SomeProfile -someBoolean -someValue exampleValue
           allowDirtyBuild: true
       # We use dirty build because we are replacing the default project settings file above
@@ -111,7 +96,6 @@ jobs:
           projectPath: ${{ matrix.projectPath }}
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
-          enableGpu: ${{ matrix.enableGpu }}
           customParameters: -profile SomeProfile -someBoolean -someValue exampleValue
           allowDirtyBuild: true
       # We use dirty build because we are replacing the default project settings file above
@@ -136,7 +120,6 @@ jobs:
           projectPath: ${{ matrix.projectPath }}
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
-          enableGpu: ${{ matrix.enableGpu }}
           customParameters: -profile SomeProfile -someBoolean -someValue exampleValue
           allowDirtyBuild: true
       # We use dirty build because we are replacing the default project settings file above
@@ -146,6 +129,6 @@ jobs:
       ###########################
       - uses: actions/upload-artifact@v4
         with:
-          name: Build ${{ matrix.targetPlatform }} on Windows (${{ matrix.unityVersion }})${{ matrix.enableGpu && ' With GPU' || '' }}${{ matrix.buildProfile && '  With Build Profile' || '' }}
+          name: Build ${{ matrix.targetPlatform }} on Windows (${{ matrix.unityVersion }})
           path: build
           retention-days: 14

.github/workflows/cleanup.yml

@@ -0,0 +1,37 @@
+name: Cleanup (cron)
+on:
+  schedule:
+    - cron: '30 10 * * SUN' # every sunday at 10:30
+
+jobs:
+  deleteArtifacts:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete old artifacts
+        uses: kolpav/purge-artifacts-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          expire-in: 21 days
+  cleanupCloudRunner:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        if: github.event.event_type != 'pull_request_target'
+        with:
+          lfs: true
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+      - run: yarn
+      - run: yarn run cli --help
+        env:
+          AWS_REGION: eu-west-2
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: eu-west-2
+      - run: yarn run cli -m list-resources
+        env:
+          AWS_REGION: eu-west-2
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: eu-west-2

.github/workflows/cloud-runner-async-checks.yml

@@ -18,16 +18,15 @@ env:
   GKE_CLUSTER: 'game-ci-github-pipelines'
   GCP_LOGGING: true
   GCP_PROJECT: unitykubernetesbuilder
-  GCP_LOG_FILE: ${{ github.workspace }}/orchestrator-logs.txt
+  GCP_LOG_FILE: ${{ github.workspace }}/cloud-runner-logs.txt
-  # Commented out: Using LocalStack tests instead of real AWS
+  AWS_REGION: eu-west-2
-  # AWS_REGION: eu-west-2
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-  # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_DEFAULT_REGION: eu-west-2
-  # AWS_DEFAULT_REGION: eu-west-2
+  AWS_STACK_NAME: game-ci-github-pipelines
-  # AWS_STACK_NAME: game-ci-github-pipelines
+  CLOUD_RUNNER_BRANCH: ${{ github.ref }}
-  ORCHESTRATOR_BRANCH: ${{ github.ref }}
+  CLOUD_RUNNER_DEBUG: true
-  ORCHESTRATOR_DEBUG: true
+  CLOUD_RUNNER_DEBUG_TREE: true
-  ORCHESTRATOR_DEBUG_TREE: true
   DEBUG: true
   UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
   PROJECT_PATH: test-project
@@ -47,14 +46,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GIT_PRIVATE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TARGET_PLATFORM: StandaloneWindows64
-          orchestratorTests: true
+          cloudRunnerTests: true
           versioning: None
-          ORCHESTRATOR_CLUSTER: local-docker
+          CLOUD_RUNNER_CLUSTER: local-docker
-          # Commented out: Using LocalStack tests instead of real AWS
+          AWS_STACK_NAME: game-ci-github-pipelines
-          # AWS_STACK_NAME: game-ci-github-pipelines
           CHECKS_UPDATE: ${{ github.event.inputs.checksObject }}
         run: |
-          git clone -b main https://github.com/game-ci/unity-builder
+          git clone -b cloud-runner-develop https://github.com/game-ci/unity-builder
           cd unity-builder
           yarn
           ls

.github/workflows/cloud-runner-ci-pipeline.yml

@@ -0,0 +1,209 @@
+name: Cloud Runner CI Pipeline
+
+on:
+  push: { branches: [cloud-runner-develop, cloud-runner-preview, main] }
+  workflow_dispatch:
+
+permissions:
+  checks: write
+  contents: read
+  actions: write
+
+env:
+  GKE_ZONE: 'us-central1'
+  GKE_REGION: 'us-central1'
+  GKE_PROJECT: 'unitykubernetesbuilder'
+  GKE_CLUSTER: 'game-ci-github-pipelines'
+  GCP_LOGGING: true
+  GCP_PROJECT: unitykubernetesbuilder
+  GCP_LOG_FILE: ${{ github.workspace }}/cloud-runner-logs.txt
+  AWS_REGION: eu-west-2
+  AWS_DEFAULT_REGION: eu-west-2
+  AWS_STACK_NAME: game-ci-team-pipelines
+  CLOUD_RUNNER_BRANCH: ${{ github.ref }}
+  DEBUG: true
+  UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+  UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+  UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
+  PROJECT_PATH: test-project
+  UNITY_VERSION: 2019.3.15f1
+  USE_IL2CPP: false
+  USE_GKE_GCLOUD_AUTH_PLUGIN: true
+
+jobs:
+  tests:
+    name: Tests
+    if: github.event.event_type != 'pull_request_target'
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        test:
+          - 'cloud-runner-end2end-locking'
+          - 'cloud-runner-end2end-caching'
+          - 'cloud-runner-end2end-retaining'
+          - 'cloud-runner-caching'
+          - 'cloud-runner-environment'
+          - 'cloud-runner-image'
+          - 'cloud-runner-hooks'
+          - 'cloud-runner-local-persistence'
+          - 'cloud-runner-locking-core'
+          - 'cloud-runner-locking-get-locked'
+    steps:
+      - name: Checkout (default)
+        uses: actions/checkout@v4
+        with:
+          lfs: false
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-2
+      - run: yarn
+      - run: yarn run test "${{ matrix.test }}" --detectOpenHandles --forceExit --runInBand
+        timeout-minutes: 60
+        env:
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
+          PROJECT_PATH: test-project
+          TARGET_PLATFORM: StandaloneWindows64
+          cloudRunnerTests: true
+          versioning: None
+          KUBE_STORAGE_CLASS: local-path
+          PROVIDER_STRATEGY: local-docker
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          GIT_PRIVATE_TOKEN: ${{ secrets.GIT_PRIVATE_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  k8sTests:
+    name: K8s Tests
+    if: github.event.event_type != 'pull_request_target'
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        test:
+          # - 'cloud-runner-async-workflow'
+          - 'cloud-runner-end2end-locking'
+          - 'cloud-runner-end2end-caching'
+          - 'cloud-runner-end2end-retaining'
+          - 'cloud-runner-kubernetes'
+          - 'cloud-runner-environment'
+          - 'cloud-runner-github-checks'
+    steps:
+      - name: Checkout (default)
+        uses: actions/checkout@v2
+        with:
+          lfs: false
+      - run: yarn
+      - name: actions-k3s
+        uses: debianmaster/actions-k3s@v1.0.5
+        with:
+          version: 'latest'
+      - run: yarn run test "${{ matrix.test }}" --detectOpenHandles --forceExit --runInBand
+        timeout-minutes: 60
+        env:
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
+          PROJECT_PATH: test-project
+          TARGET_PLATFORM: StandaloneWindows64
+          cloudRunnerTests: true
+          versioning: None
+          KUBE_STORAGE_CLASS: local-path
+          PROVIDER_STRATEGY: k8s
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          GIT_PRIVATE_TOKEN: ${{ secrets.GIT_PRIVATE_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  awsTests:
+    name: AWS Tests
+    if: github.event.event_type != 'pull_request_target'
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        test:
+          - 'cloud-runner-end2end-locking'
+          - 'cloud-runner-end2end-caching'
+          - 'cloud-runner-end2end-retaining'
+          - 'cloud-runner-environment'
+          - 'cloud-runner-s3-steps'
+    steps:
+      - name: Checkout (default)
+        uses: actions/checkout@v2
+        with:
+          lfs: false
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-2
+      - run: yarn
+      - run: yarn run test "${{ matrix.test }}" --detectOpenHandles --forceExit --runInBand
+        timeout-minutes: 60
+        env:
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
+          PROJECT_PATH: test-project
+          TARGET_PLATFORM: StandaloneWindows64
+          cloudRunnerTests: true
+          versioning: None
+          KUBE_STORAGE_CLASS: local-path
+          PROVIDER_STRATEGY: aws
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          GIT_PRIVATE_TOKEN: ${{ secrets.GIT_PRIVATE_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  buildTargetTests:
+    name: Local Build Target Tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        providerStrategy:
+          #- aws
+          - local-docker
+          #- k8s
+        targetPlatform:
+          - StandaloneOSX # Build a macOS standalone (Intel 64-bit).
+          - StandaloneWindows64 # Build a Windows 64-bit standalone.
+          - StandaloneLinux64 # Build a Linux 64-bit standalone.
+          - WebGL # WebGL.
+          - iOS # Build an iOS player.
+          # - Android # Build an Android .apk.
+    steps:
+      - name: Checkout (default)
+        uses: actions/checkout@v4
+        with:
+          lfs: false
+      - run: yarn
+      - uses: ./
+        id: unity-build
+        timeout-minutes: 30
+        env:
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
+
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          GIT_PRIVATE_TOKEN: ${{ secrets.GIT_PRIVATE_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          cloudRunnerTests: true
+          versioning: None
+          targetPlatform: ${{ matrix.targetPlatform }}
+          providerStrategy: ${{ matrix.providerStrategy }}
+      - run: |
+          cp ./cloud-runner-cache/cache/${{ steps.unity-build.outputs.CACHE_KEY }}/build/${{ steps.unity-build.outputs.BUILD_ARTIFACT }} ${{ steps.unity-build.outputs.BUILD_ARTIFACT }}
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.providerStrategy }} Build (${{ matrix.targetPlatform }})
+          path: ${{ steps.unity-build.outputs.BUILD_ARTIFACT }}
+          retention-days: 14

.github/workflows/integrity-check.yml

@@ -4,11 +4,6 @@ on:
   push: { branches: [main] }
   pull_request: {}
 
-permissions:
-  contents: read
-  checks: write
-  statuses: write
-
 env:
   CODECOV_TOKEN: '2f2eb890-30e2-4724-83eb-7633832cf0de'
 
@@ -27,12 +22,7 @@ jobs:
           node-version: '18'
       - run: yarn
       - run: yarn lint
-      - run: yarn test:ci --coverage
+      - run: yarn test --coverage
       - run: bash <(curl -s https://codecov.io/bash)
       - run: yarn build || { echo "build command should always succeed" ; exit 61; }
-  #      - run: yarn build --quiet && git diff --quiet dist || { echo "dist should be auto generated" ; git diff dist ; exit 62; }
+#      - run: yarn build --quiet && git diff --quiet dist || { echo "dist should be auto generated" ; git diff dist ; exit 62; }
-
-  orchestrator:
-    name: Orchestrator Integrity
-    uses: ./.github/workflows/orchestrator-integrity.yml
-    secrets: inherit

.gitignore

@@ -5,5 +5,3 @@ lib/
 .vsconfig
 yarn-error.log
 .orig
-$LOG_FILE
-temp/

action.yml

@@ -104,11 +104,11 @@ inputs:
   gitPrivateToken:
     required: false
     default: ''
-    description: '[Orchestrator] Github private token to pull from github'
+    description: '[CloudRunner] Github private token to pull from github'
   githubOwner:
     required: false
     default: ''
-    description: '[Orchestrator] GitHub owner name or organization/team name'
+    description: '[CloudRunner] GitHub owner name or organization/team name'
   runAsHostUser:
     required: false
     default: 'false'
@@ -149,101 +149,97 @@ inputs:
   allowDirtyBuild:
     required: false
     default: ''
-    description: '[Orchestrator] Allows the branch of the build to be dirty, and still generate the build.'
+    description: '[CloudRunner] Allows the branch of the build to be dirty, and still generate the build.'
   postBuildSteps:
     required: false
     default: ''
     description:
-      '[Orchestrator] run a post build job in yaml format with the keys image, secrets (name, value object array),
+      '[CloudRunner] run a post build job in yaml format with the keys image, secrets (name, value object array),
       command string'
   preBuildSteps:
     required: false
     default: ''
     description:
-      '[Orchestrator] Run a pre build job after the repository setup but before the build job (in yaml format with the
+      '[CloudRunner] Run a pre build job after the repository setup but before the build job (in yaml format with the
       keys image, secrets (name, value object array), command line string)'
   containerHookFiles:
     required: false
     default: ''
     description:
-      '[Orchestrator] Specify the names (by file name) of custom steps to run before or after orchestrator jobs, must
+      '[CloudRunner] Specify the names (by file name) of custom steps to run before or after cloud runner jobs, must
       match a yaml step file inside your repo in the folder .game-ci/steps/'
   customHookFiles:
     required: false
     default: ''
     description:
-      '[Orchestrator] Specify the names (by file name) of custom hooks to run before or after orchestrator jobs, must
+      '[CloudRunner] Specify the names (by file name) of custom hooks to run before or after cloud runner jobs, must
       match a yaml step file inside your repo in the folder .game-ci/hooks/'
   customCommandHooks:
     required: false
     default: ''
-    description: '[Orchestrator] Specify custom commands and trigger hooks (injects commands into jobs)'
+    description: '[CloudRunner] Specify custom commands and trigger hooks (injects commands into jobs)'
   customJob:
     required: false
     default: ''
     description:
-      '[Orchestrator] Run a custom job instead of the standard build automation for orchestrator (in yaml format with
+      '[CloudRunner] Run a custom job instead of the standard build automation for cloud runner (in yaml format with the
-      the keys image, secrets (name, value object array), command line string)'
+      keys image, secrets (name, value object array), command line string)'
   awsStackName:
     default: 'game-ci'
     required: false
-    description: '[Orchestrator] The Cloud Formation stack name that must be setup before using this option.'
+    description: '[CloudRunner] The Cloud Formation stack name that must be setup before using this option.'
   providerStrategy:
     default: 'local'
     required: false
     description:
-      '[Orchestrator] Either local, k8s or aws can be used to run builds on a remote cluster. Additional parameters must
+      '[CloudRunner] Either local, k8s or aws can be used to run builds on a remote cluster. Additional parameters must
       be configured.'
-  resourceTracking:
-    default: 'false'
-    required: false
-    description: '[Orchestrator] Enable resource tracking logs for disk usage and allocation summaries.'
   containerCpu:
     default: ''
     required: false
-    description: '[Orchestrator] Amount of CPU time to assign the remote build container'
+    description: '[CloudRunner] Amount of CPU time to assign the remote build container'
   containerMemory:
     default: ''
     required: false
-    description: '[Orchestrator] Amount of memory to assign the remote build container'
+    description: '[CloudRunner] Amount of memory to assign the remote build container'
   readInputFromOverrideList:
     default: ''
     required: false
-    description: '[Orchestrator] Comma separated list of input value names to read from "input override command"'
+    description: '[CloudRunner] Comma separated list of input value names to read from "input override command"'
   readInputOverrideCommand:
     default: ''
     required: false
     description:
-      '[Orchestrator] Extend game ci by specifying a command to execute to pull input from external source e.g cloud
+      '[CloudRunner] Extend game ci by specifying a command to execute to pull input from external source e.g cloud
       provider secret managers'
   kubeConfig:
     default: ''
     required: false
     description:
-      '[Orchestrator] Supply a base64 encoded kubernetes config to run builds on kubernetes and stream logs until
+      '[CloudRunner] Supply a base64 encoded kubernetes config to run builds on kubernetes and stream logs until
       completion.'
   kubeVolume:
     default: ''
     required: false
-    description: '[Orchestrator] Supply a Persistent Volume Claim name to use for the Unity build.'
+    description: '[CloudRunner] Supply a Persistent Volume Claim name to use for the Unity build.'
   kubeStorageClass:
     default: ''
     required: false
     description:
-      '[Orchestrator] Kubernetes storage class to use for orchestrator jobs, leave empty to install rook cluster.'
+      '[CloudRunner] Kubernetes storage class to use for cloud runner jobs, leave empty to install rook cluster.'
   kubeVolumeSize:
     default: '5Gi'
     required: false
-    description: '[Orchestrator] Amount of disc space to assign the Kubernetes Persistent Volume'
+    description: '[CloudRunner] Amount of disc space to assign the Kubernetes Persistent Volume'
   cacheKey:
     default: ''
     required: false
-    description: '[Orchestrator] Cache key to indicate bucket for cache'
+    description: '[CloudRunner] Cache key to indicate bucket for cache'
   watchToEnd:
     default: 'true'
     required: false
     description:
-      '[Orchestrator] Whether or not to watch the build to the end. Can be used for especially long running jobs e.g
+      '[CloudRunner] Whether or not to watch the build to the end. Can be used for especially long running jobs e.g
       imports or self-hosted ephemeral runners.'
   cacheUnityInstallationOnMac:
     default: 'false'
@@ -269,34 +265,6 @@ inputs:
     default: 'false'
     required: false
     description: 'Skip the activation/deactivation of Unity. This assumes Unity is already activated.'
-  cloneDepth:
-    default: '50'
-    required: false
-    description: '[Orchestrator] Specifies the depth of the git clone for the repository. Use 0 for full clone.'
-  orchestratorRepoName:
-    default: 'game-ci/unity-builder'
-    required: false
-    description:
-      '[Orchestrator] Specifies the repo for the unity builder. Useful if you forked the repo for testing, features, or
-      fixes.'
-  syncStrategy:
-    description: 'Workspace sync strategy: full, git-delta, direct-input, storage-pull'
-    required: false
-    default: 'full'
-  syncInputRef:
-    description: 'URI for direct-input or storage-pull content (storage://remote/path or file path)'
-    required: false
-  syncStorageRemote:
-    description: 'rclone remote name for storage-backed inputs (defaults to rcloneRemote)'
-    required: false
-  syncRevertAfter:
-    description: 'Revert overlaid changes after job completion'
-    required: false
-    default: 'true'
-  syncStatePath:
-    description: 'Path to sync state file for delta tracking'
-    required: false
-    default: '.game-ci/sync-state.json'
 
 outputs:
   volume:

dist/default-build-script/Assets/Editor/UnityBuilderAction/Builder.cs

@@ -56,19 +56,14 @@ namespace UnityBuilderAction
       // of either `UnityEditor.BuildPlayerOptions` or `UnityEditor.BuildPlayerWithProfileOptions`
       dynamic buildPlayerOptions;
 
-      if (options.TryGetValue("activeBuildProfile", out var buildProfilePath)) {
+      if (options["customBuildProfile"] != "") {
-        if (string.IsNullOrEmpty(buildProfilePath)) {
-          throw new Exception("`-activeBuildProfile` is set but with an empty value; this shouldn't happen");
-        }
 
 #if UNITY_6000_0_OR_NEWER
         // Load build profile from Assets folder
-        var buildProfile = AssetDatabase.LoadAssetAtPath<BuildProfile>(buildProfilePath)
+        BuildProfile buildProfile = AssetDatabase.LoadAssetAtPath<BuildProfile>(options["customBuildProfile"]);
-                           ?? throw new Exception("Build profile file not found at path: " + buildProfilePath);
 
-        // no need to set active profile, as already set by `-activeBuildProfile` CLI argument
+        // Set it as active
-        // BuildProfile.SetActiveBuildProfile(buildProfile);
+        BuildProfile.SetActiveBuildProfile(buildProfile);
-        Debug.Log($"build profile: {buildProfile.name}");
 
         // Define BuildPlayerWithProfileOptions
         buildPlayerOptions = new BuildPlayerWithProfileOptions {
@@ -76,16 +71,12 @@ namespace UnityBuilderAction
             locationPathName = options["customBuildPath"],
             options = buildOptions,
         };
-#else // UNITY_6000_0_OR_NEWER
+#else
         throw new Exception("Build profiles are not supported by this version of Unity (" + Application.unityVersion +")");
-#endif // UNITY_6000_0_OR_NEWER
+#endif
 
       } else {
 
-#if BUILD_PROFILE_LOADED
-        throw new Exception("Build profile's define symbol present; shouldn't happen");
-#endif // BUILD_PROFILE_LOADED
-
         // Gather values from project
         var scenes = EditorBuildSettings.scenes.Where(scene => scene.enabled).Select(s => s.path).ToArray();
 

dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/AndroidSettings.cs

@@ -74,20 +74,7 @@ namespace UnityBuilderAction.Input
       string symbolType;
       if (options.TryGetValue("androidSymbolType", out symbolType) && !string.IsNullOrEmpty(symbolType))
       {
-#if UNITY_6000_0_OR_NEWER
+#if UNITY_2021_1_OR_NEWER
-        switch (symbolType)
-        {
-          case "public":
-            SetDebugSymbols("SymbolTable");
-            break;
-          case "debugging":
-            SetDebugSymbols("Full");
-            break;
-          case "none":
-            SetDebugSymbols("None");
-            break;
-        }
-#elif UNITY_2021_1_OR_NEWER
         switch (symbolType)
         {
           case "public":
@@ -114,37 +101,5 @@ namespace UnityBuilderAction.Input
 #endif
       }
     }
-
-#if UNITY_6000_0_OR_NEWER
-    private static void SetDebugSymbols(string enumValueName)
-    {
-      // UnityEditor.Android.UserBuildSettings and Unity.Android.Types.DebugSymbolLevel are part of the Unity Android module.
-      // Reflection is used here to ensure the code works even if the module is not installed.
-
-      var debugSymbolsType = Type.GetType("UnityEditor.Android.UserBuildSettings+DebugSymbols, UnityEditor.Android.Extensions");
-      if (debugSymbolsType == null)
-      {
-        return;
-      }
-
-      var levelProp = debugSymbolsType.GetProperty("level", BindingFlags.Static | BindingFlags.Public);
-      if (levelProp == null)
-      {
-        return;
-      }
-
-      var enumType = Type.GetType("Unity.Android.Types.DebugSymbolLevel, Unity.Android.Types");
-      if (enumType == null)
-      {
-        return;
-      }
-
-      if (!Enum.TryParse(enumType, enumValueName, false , out var enumValue))
-      {
-        return;
-      }
-      levelProp.SetValue(null, enumValue);
-    }
-#endif
   }
 }

dist/default-build-script/Assets/Editor/UnityBuilderAction/Input/ArgumentsParser.cs

@@ -21,19 +21,6 @@ namespace UnityBuilderAction.Input
         EditorApplication.Exit(110);
       }
 
-#if UNITY_6000_0_OR_NEWER
-      var buildProfileSupport = true;
-#else
-      var buildProfileSupport = false;
-#endif // UNITY_6000_0_OR_NEWER
-
-      string buildProfile;
-      if (buildProfileSupport && validatedOptions.TryGetValue("activeBuildProfile", out buildProfile)) {
-        if (validatedOptions.ContainsKey("buildTarget")) {
-          Console.WriteLine("Extra argument -buildTarget");
-          EditorApplication.Exit(122);
-        }
-      } else {
       string buildTarget;
       if (!validatedOptions.TryGetValue("buildTarget", out buildTarget)) {
         Console.WriteLine("Missing argument -buildTarget");
@@ -44,7 +31,6 @@ namespace UnityBuilderAction.Input
         Console.WriteLine(buildTarget + " is not a defined " + typeof(BuildTarget).Name);
         EditorApplication.Exit(121);
       }
-      }
 
       string customBuildPath;
       if (!validatedOptions.TryGetValue("customBuildPath", out customBuildPath)) {

dist/platforms/mac/steps/activate.sh

@@ -4,69 +4,21 @@
 echo "Changing to \"$ACTIVATE_LICENSE_PATH\" directory."
 pushd "$ACTIVATE_LICENSE_PATH"
 
-if [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
+echo "Requesting activation"
-  #
-  # SERIAL LICENSE MODE
-  #
-  # This will activate unity, using the serial activation process.
-  #
 
-  echo "Requesting activation"
+# Activate license
+/Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/MacOS/Unity \
+  -logFile - \
+  -batchmode \
+  -nographics \
+  -quit \
+  -serial "$UNITY_SERIAL" \
+  -username "$UNITY_EMAIL" \
+  -password "$UNITY_PASSWORD" \
+  -projectPath "$ACTIVATE_LICENSE_PATH"
 
-  # Activate license
+# Store the exit code from the verify command
-  /Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/MacOS/Unity \
+UNITY_EXIT_CODE=$?
-    -logFile - \
-    -batchmode \
-    -nographics \
-    -quit \
-    -serial "$UNITY_SERIAL" \
-    -username "$UNITY_EMAIL" \
-    -password "$UNITY_PASSWORD" \
-    -projectPath "$ACTIVATE_LICENSE_PATH"
-
-  # Store the exit code from the verify command
-  UNITY_EXIT_CODE=$?
-
-elif [[ -n "$UNITY_LICENSING_SERVER" ]]; then
-  #
-  # Custom Unity License Server
-  #
-  echo "Adding licensing server config"
-  mkdir -p "$UNITY_LICENSE_PATH/config/"
-  cp "$ACTION_FOLDER/unity-config/services-config.json" "$UNITY_LICENSE_PATH/config/services-config.json"
-
-  /Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/Frameworks/UnityLicensingClient.app/Contents/MacOS/Unity.Licensing.Client \
-    --acquire-floating > license.txt
-
-  # Store the exit code from the verify command
-  UNITY_EXIT_CODE=$?
-
-  if [ $UNITY_EXIT_CODE -eq 0 ]; then
-    PARSEDFILE=$(grep -oE '\"[^"]*\"' < license.txt | tr -d '"')
-    export FLOATING_LICENSE
-    FLOATING_LICENSE=$(sed -n 2p <<< "$PARSEDFILE")
-    FLOATING_LICENSE_TIMEOUT=$(sed -n 4p <<< "$PARSEDFILE")
-
-    echo "Acquired floating license: \"$FLOATING_LICENSE\" with timeout $FLOATING_LICENSE_TIMEOUT"
-  fi
-else
-  #
-  # NO LICENSE ACTIVATION STRATEGY MATCHED
-  #
-  # This will exit since no activation strategies could be matched.
-  #
-  echo "License activation strategy could not be determined."
-  echo ""
-  echo "Visit https://game.ci/docs/github/activation for more"
-  echo "details on how to set up one of the possible activation strategies."
-
-  echo "::error ::No valid license activation strategy could be determined. Make sure to provide UNITY_EMAIL, UNITY_PASSWORD, and either a UNITY_SERIAL \
-or UNITY_LICENSE. Otherwise please use UNITY_LICENSING_SERVER. See more info at https://game.ci/docs/github/activation"
-
-  # Immediately exit as no UNITY_EXIT_CODE can be derived.
-  exit 1;
-
-fi
 
 #
 # Display information about the result

dist/platforms/mac/steps/build.sh

@@ -149,13 +149,14 @@ echo ""
   $( [ "${MANUAL_EXIT}" == "true" ] || echo "-quit" ) \
   -batchmode \
   $( [ "${ENABLE_GPU}" == "true" ] || echo "-nographics" ) \
+  -username "$UNITY_EMAIL" \
+  -password "$UNITY_PASSWORD" \
   -customBuildName "$BUILD_NAME" \
   -projectPath "$UNITY_PROJECT_PATH" \
-  $( [ -z "$BUILD_PROFILE" ] && echo "-buildTarget $BUILD_TARGET") \
+  -buildTarget "$BUILD_TARGET" \
   -customBuildTarget "$BUILD_TARGET" \
   -customBuildPath "$CUSTOM_BUILD_PATH" \
   -customBuildProfile "$BUILD_PROFILE" \
-  ${BUILD_PROFILE:+-activeBuildProfile} ${BUILD_PROFILE:+"$BUILD_PROFILE"} \
   -executeMethod "$BUILD_METHOD" \
   -buildVersion "$VERSION" \
   -androidVersionCode "$ANDROID_VERSION_CODE" \

dist/platforms/mac/steps/return_license.sh

@@ -4,29 +4,15 @@
 echo "Changing to \"$ACTIVATE_LICENSE_PATH\" directory."
 pushd "$ACTIVATE_LICENSE_PATH"
 
-if [[ -n "$UNITY_LICENSING_SERVER" ]]; then
+/Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/MacOS/Unity \
-  #
+  -logFile - \
-  # Return any floating license used.
+  -batchmode \
-  #
+  -nographics \
-  echo "Returning floating license: \"$FLOATING_LICENSE\""
+  -quit \
-  /Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/Frameworks/UnityLicensingClient.app/Contents/MacOS/Unity.Licensing.Client \
+  -username "$UNITY_EMAIL" \
-    --return-floating "$FLOATING_LICENSE"
+  -password "$UNITY_PASSWORD" \
-elif [[ -n "$UNITY_SERIAL" ]]; then
+  -returnlicense \
-  #
+  -projectPath "$ACTIVATE_LICENSE_PATH"
-  # SERIAL LICENSE MODE
-  #
-  # This will return the license that is currently in use.
-  #
-  /Applications/Unity/Hub/Editor/$UNITY_VERSION/Unity.app/Contents/MacOS/Unity \
-    -logFile - \
-    -batchmode \
-    -nographics \
-    -quit \
-    -username "$UNITY_EMAIL" \
-    -password "$UNITY_PASSWORD" \
-    -returnlicense \
-    -projectPath "$ACTIVATE_LICENSE_PATH"
-fi
 
 # Return to previous working directory
 popd

dist/platforms/ubuntu/steps/activate.sh

@@ -68,18 +68,14 @@ elif [[ -n "$UNITY_LICENSING_SERVER" ]]; then
   echo "Adding licensing server config"
 
   /opt/unity/Editor/Data/Resources/Licensing/Client/Unity.Licensing.Client --acquire-floating > license.txt #is this accessible in a env variable?
+  PARSEDFILE=$(grep -oP '\".*?\"' < license.txt | tr -d '"')
+  export FLOATING_LICENSE
+  FLOATING_LICENSE=$(sed -n 2p <<< "$PARSEDFILE")
+  FLOATING_LICENSE_TIMEOUT=$(sed -n 4p <<< "$PARSEDFILE")
 
+  echo "Acquired floating license: \"$FLOATING_LICENSE\" with timeout $FLOATING_LICENSE_TIMEOUT"
   # Store the exit code from the verify command
   UNITY_EXIT_CODE=$?
-
-  if [ $UNITY_EXIT_CODE -eq 0 ]; then
-    PARSEDFILE=$(grep -oP '\".*?\"' < license.txt | tr -d '"')
-    export FLOATING_LICENSE
-    FLOATING_LICENSE=$(sed -n 2p <<< "$PARSEDFILE")
-    FLOATING_LICENSE_TIMEOUT=$(sed -n 4p <<< "$PARSEDFILE")
-
-    echo "Acquired floating license: \"$FLOATING_LICENSE\" with timeout $FLOATING_LICENSE_TIMEOUT"
-  fi
 else
   #
   # NO LICENSE ACTIVATION STRATEGY MATCHED

dist/platforms/ubuntu/steps/build.sh

@@ -125,11 +125,10 @@ unity-editor \
   $( [ "${MANUAL_EXIT}" == "true" ] || echo "-quit" ) \
   -customBuildName "$BUILD_NAME" \
   -projectPath "$UNITY_PROJECT_PATH" \
-  $( [ -z "$BUILD_PROFILE" ] && echo "-buildTarget $BUILD_TARGET" ) \
+  -buildTarget "$BUILD_TARGET" \
   -customBuildTarget "$BUILD_TARGET" \
   -customBuildPath "$CUSTOM_BUILD_PATH" \
   -customBuildProfile "$BUILD_PROFILE" \
-  ${BUILD_PROFILE:+-activeBuildProfile} ${BUILD_PROFILE:+"$BUILD_PROFILE"} \
   -executeMethod "$BUILD_METHOD" \
   -buildVersion "$VERSION" \
   -androidVersionCode "$ANDROID_VERSION_CODE" \

dist/platforms/windows/build.ps1

@@ -148,24 +148,18 @@ Write-Output "#    Building project     #"
 Write-Output "###########################"
 Write-Output ""
 
-$unityGraphics = "-nographics"
-
-if ($LLVMPIPE_INSTALLED -eq "true")
-{
-  $unityGraphics = "-force-opengl"
-}
-
 # If $Env:CUSTOM_PARAMETERS contains spaces and is passed directly on the command line to Unity, powershell will wrap it
 # in double quotes.  To avoid this, parse $Env:CUSTOM_PARAMETERS into an array, while respecting any quotations within the string.
 $_, $customParametersArray = Invoke-Expression('Write-Output -- "" ' + $Env:CUSTOM_PARAMETERS)
 $unityArgs = @(
     "-quit",
     "-batchmode",
-    $unityGraphics,
+    "-nographics",
     "-silent-crashes",
     "-customBuildName", "`"$Env:BUILD_NAME`"",
     "-projectPath", "`"$Env:UNITY_PROJECT_PATH`"",
     "-executeMethod", "`"$Env:BUILD_METHOD`"",
+    "-buildTarget", "`"$Env:BUILD_TARGET`"",
     "-customBuildTarget", "`"$Env:BUILD_TARGET`"",
     "-customBuildPath", "`"$Env:CUSTOM_BUILD_PATH`"",
     "-customBuildProfile", "`"$Env:BUILD_PROFILE`"",
@@ -180,13 +174,6 @@ $unityArgs = @(
     "-logfile", "-"
 ) + $customParametersArray
 
-if (-not $Env:BUILD_PROFILE) {
-    $unityArgs += @("-buildTarget", "`"$Env:BUILD_TARGET`"")
-}
-if ($Env:BUILD_PROFILE) {
-    $unityArgs += @("-activeBuildProfile", "`"$Env:BUILD_PROFILE`"")
-}
-
 # Remove null items as that will fail the Start-Process call
 $unityArgs = $unityArgs | Where-Object { $_ -ne $null }
 

dist/platforms/windows/entrypoint.ps1

@@ -1,13 +1,5 @@
 Get-Process
 
-# Copy .upmconfig.toml if it exists
-if (Test-Path "C:\githubhome\.upmconfig.toml") {
-  Write-Host "Copying .upmconfig.toml to $Env:USERPROFILE\.upmconfig.toml"
-  Copy-Item -Path "C:\githubhome\.upmconfig.toml" -Destination "$Env:USERPROFILE\.upmconfig.toml" -Force
-} else {
-  Write-Host "No .upmconfig.toml found at C:\githubhome"
-}
-
 # Import any necessary registry keys, ie: location of windows 10 sdk
 # No guarantee that there will be any necessary registry keys, ie: tvOS
 Get-ChildItem -Path c:\regkeys -File | ForEach-Object { reg import $_.fullname }
@@ -18,17 +10,9 @@ regsvr32 C:\ProgramData\Microsoft\VisualStudio\Setup\x64\Microsoft.VisualStudio.
 # Kill the regsvr process
 Get-Process -Name regsvr32 | ForEach-Object { Stop-Process -Id $_.Id -Force }
 
-# Install Visual C++ 2013 Redistributables
-. "c:\steps\install_vcredist13.ps1"
-
 # Setup Git Credentials
 . "c:\steps\set_gitcredential.ps1"
 
-if ($env:ENABLE_GPU -eq "true") {
-  # Install LLVMpipe software graphics driver
-  . "c:\steps\install_llvmpipe.ps1"
-}
-
 # Activate Unity
 if ($env:SKIP_ACTIVATION -ne "true") {
   . "c:\steps\activate.ps1"

dist/platforms/windows/install_llvmpipe.ps1

@@ -1,56 +0,0 @@
-$Private:repo = "mmozeiko/build-mesa"
-$Private:downloadPath = "$Env:TEMP\mesa.zip"
-$Private:extractPath = "$Env:TEMP\mesa"
-$Private:destinationPath = "$Env:UNITY_PATH\Editor\"
-$Private:version = "25.1.0"
-
-$LLVMPIPE_INSTALLED = "false"
-
-try {
-    # Get the release info from GitHub API (version fixed to decrease probability of breakage)
-    $releaseUrl = "https://api.github.com/repos/$repo/releases/tags/$version"
-    $release = Invoke-RestMethod -Uri $releaseUrl -Headers @{ "User-Agent" = "PowerShell" }
-
-    # Get the download URL for the zip asset
-    $zipUrl = $release.assets | Where-Object { $_.name -like "mesa-llvmpipe-x64*.zip" } | Select-Object -First 1 -ExpandProperty browser_download_url
-
-    if (-not $zipUrl) {
-        throw "No zip file found in the latest release."
-    }
-
-    # Download the zip file
-    Write-Host "Downloading $zipUrl..."
-    Invoke-WebRequest -Uri $zipUrl -OutFile $downloadPath
-
-    # Create extraction directory if it doesn't exist
-    if (-not (Test-Path $extractPath)) {
-        New-Item -ItemType Directory -Path $extractPath | Out-Null
-    }
-
-    # Extract the zip file
-    Write-Host "Extracting $downloadPath to $extractPath..."
-    Expand-Archive -Path $downloadPath -DestinationPath $extractPath -Force
-
-    # Create destination directory if it doesn't exist
-    if (-not (Test-Path $destinationPath)) {
-        New-Item -ItemType Directory -Path $destinationPath | Out-Null
-    }
-
-    # Copy extracted files to destination
-    Write-Host "Copying files to $destinationPath..."
-    Copy-Item -Path "$extractPath\*" -Destination $destinationPath -Recurse -Force
-
-    Write-Host "Successfully downloaded, extracted, and copied Mesa files to $destinationPath"
-
-    $LLVMPIPE_INSTALLED = "true"
-} catch {
-    Write-Error "An error occurred: $_"
-} finally {
-    # Clean up temporary files
-    if (Test-Path $downloadPath) {
-        Remove-Item $downloadPath -Force
-    }
-    if (Test-Path $extractPath) {
-        Remove-Item $extractPath -Recurse -Force
-    }
-}

dist/platforms/windows/install_vcredist13.ps1

@@ -1,11 +0,0 @@
-# For some reason, Unity is failing in github actions windows runners
-# due to missing Visual C++ 2013 redistributables.
-# This script downloads and installs the required redistributables.
-Write-Output ""
-Write-Output "#########################################################"
-Write-Output "#     Installing Visual C++ Redistributables (2013)     #"
-Write-Output "#########################################################"
-Write-Output ""
-
-
-choco install vcredist2013 -y --no-progress

jest.ci.config.js

@@ -1,11 +0,0 @@
-const base = require('./jest.config.js');
-
-module.exports = {
-  ...base,
-  forceExit: true,
-  detectOpenHandles: true,
-  testTimeout: 120000,
-  maxWorkers: 1,
-};
-
-

jest.config.js

@@ -25,6 +25,6 @@ module.exports = {
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
   modulePathIgnorePatterns: ['<rootDir>/lib/', '<rootDir>/dist/'],
 
-  // Use jest.setup.js to polyfill fetch for all tests
+  // A list of paths to modules that run some code to configure or set up the testing framework before each test
-  setupFiles: ['<rootDir>/jest.setup.js'],
+  setupFilesAfterEnv: ['<rootDir>/src/jest.setup.ts'],
 };

jest.setup.js

@@ -1,2 +0,0 @@
-const fetch = require('node-fetch');
-global.fetch = fetch;

package.json

@@ -12,18 +12,17 @@
     "lint": "prettier --check \"src/**/*.{js,ts}\" && eslint src/**/*.ts",
     "format": "prettier --write \"src/**/*.{js,ts}\"",
     "cli": "yarn ts-node src/index.ts -m cli",
-    "gcp-secrets-tests": "cross-env providerStrategy=aws orchestratorTests=true inputPullCommand=\"gcp-secret-manager\" populateOverride=true pullInputList=UNITY_EMAIL,UNITY_SERIAL,UNITY_PASSWORD yarn test -i -t \"orchestrator\"",
+    "gcp-secrets-tests": "cross-env providerStrategy=aws cloudRunnerTests=true inputPullCommand=\"gcp-secret-manager\" populateOverride=true pullInputList=UNITY_EMAIL,UNITY_SERIAL,UNITY_PASSWORD yarn test -i -t \"cloud runner\"",
-    "gcp-secrets-cli": "cross-env orchestratorTests=true USE_IL2CPP=false inputPullCommand=\"gcp-secret-manager\" yarn ts-node src/index.ts -m cli --populateOverride true --pullInputList UNITY_EMAIL,UNITY_SERIAL,UNITY_PASSWORD",
+    "gcp-secrets-cli": "cross-env cloudRunnerTests=true USE_IL2CPP=false inputPullCommand=\"gcp-secret-manager\" yarn ts-node src/index.ts -m cli --populateOverride true --pullInputList UNITY_EMAIL,UNITY_SERIAL,UNITY_PASSWORD",
-    "aws-secrets-cli": "cross-env orchestratorTests=true inputPullCommand=\"aws-secret-manager\" yarn ts-node src/index.ts -m cli --populateOverride true --pullInputList UNITY_EMAIL,UNITY_SERIAL,UNITY_PASSWORD",
+    "aws-secrets-cli": "cross-env cloudRunnerTests=true inputPullCommand=\"aws-secret-manager\" yarn ts-node src/index.ts -m cli --populateOverride true --pullInputList UNITY_EMAIL,UNITY_SERIAL,UNITY_PASSWORD",
     "cli-aws": "cross-env providerStrategy=aws yarn run test-cli",
     "cli-k8s": "cross-env providerStrategy=k8s yarn run test-cli",
-    "test-cli": "cross-env orchestratorTests=true yarn ts-node src/index.ts -m cli --projectPath test-project",
+    "test-cli": "cross-env cloudRunnerTests=true yarn ts-node src/index.ts -m cli --projectPath test-project",
     "test": "jest",
-    "test:ci": "jest --config=jest.ci.config.js --runInBand",
+    "test-i": "cross-env cloudRunnerTests=true yarn test -i -t \"cloud runner\"",
-    "test-i": "cross-env orchestratorTests=true yarn test -i -t \"orchestrator\"",
     "test-i-*": "yarn run test-i-aws && yarn run test-i-k8s",
-    "test-i-aws": "cross-env orchestratorTests=true providerStrategy=aws yarn test -i -t \"orchestrator\"",
+    "test-i-aws": "cross-env cloudRunnerTests=true providerStrategy=aws yarn test -i -t \"cloud runner\"",
-    "test-i-k8s": "cross-env orchestratorTests=true providerStrategy=k8s yarn test -i -t \"orchestrator\""
+    "test-i-k8s": "cross-env cloudRunnerTests=true providerStrategy=k8s yarn test -i -t \"cloud runner\""
   },
   "engines": {
     "node": ">=18.x"
@@ -33,11 +32,6 @@
     "@actions/core": "^1.11.1",
     "@actions/exec": "^1.1.1",
     "@actions/github": "^6.0.0",
-    "@aws-sdk/client-cloudformation": "^3.777.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.777.0",
-    "@aws-sdk/client-ecs": "^3.778.0",
-    "@aws-sdk/client-kinesis": "^3.777.0",
-    "@aws-sdk/client-s3": "^3.779.0",
     "@kubernetes/client-node": "^0.16.3",
     "@octokit/core": "^5.1.0",
     "async-wait-until": "^2.0.12",
@@ -50,9 +44,8 @@
     "nanoid": "^3.3.1",
     "reflect-metadata": "^0.1.13",
     "semver": "^7.5.2",
-    "shell-quote": "^1.8.3",
     "ts-md5": "^1.3.1",
-    "unity-changeset": "^3.1.0",
+    "unity-changeset": "^2.0.0",
     "uuid": "^9.0.0",
     "yaml": "^2.2.2"
   },
@@ -76,7 +69,6 @@
     "jest-fail-on-console": "^3.0.2",
     "js-yaml": "^4.1.0",
     "lefthook": "^1.6.1",
-    "node-fetch": "2",
     "prettier": "^2.5.1",
     "ts-jest": "^27.1.3",
     "ts-node": "10.8.1",

src/index.ts

@@ -1,10 +1,8 @@
 import * as core from '@actions/core';
-import { Action, BuildParameters, Cache, Orchestrator, Docker, ImageTag, Output } from './model';
+import { Action, BuildParameters, Cache, CloudRunner, Docker, ImageTag, Output } from './model';
 import { Cli } from './model/cli/cli';
 import MacBuilder from './model/mac-builder';
 import PlatformSetup from './model/platform-setup';
-import { IncrementalSyncService } from './model/orchestrator/services/sync';
-import { SyncStrategy } from './model/orchestrator/services/sync/sync-state';
 
 async function runMain() {
   try {
@@ -25,14 +23,6 @@ async function runMain() {
 
     if (buildParameters.providerStrategy === 'local') {
       core.info('Building locally');
-
-      // Apply incremental sync strategy before build
-      const syncStrategy = buildParameters.syncStrategy as SyncStrategy;
-      if (syncStrategy !== 'full') {
-        core.info(`[Sync] Applying sync strategy: ${syncStrategy}`);
-        await applySyncStrategy(buildParameters, workspace);
-      }
-
       await PlatformSetup.setup(buildParameters, actionFolder);
       exitCode =
         process.platform === 'darwin'
@@ -42,18 +32,8 @@ async function runMain() {
               actionFolder,
               ...buildParameters,
             });
-
-      // Revert overlays after job completion if configured
-      if (buildParameters.syncRevertAfter && syncStrategy !== 'full') {
-        core.info('[Sync] Reverting overlay changes after job completion');
-        try {
-          await IncrementalSyncService.revertOverlays(workspace, buildParameters.syncStatePath);
-        } catch (revertError) {
-          core.warning(`[Sync] Overlay revert failed: ${(revertError as Error).message}`);
-        }
-      }
     } else {
-      await Orchestrator.run(buildParameters, baseImage.toString());
+      await CloudRunner.run(buildParameters, baseImage.toString());
       exitCode = 0;
     }
 
@@ -70,58 +50,4 @@ async function runMain() {
   }
 }
 
-/**
- * Apply the configured sync strategy to the workspace before build.
- */
-async function applySyncStrategy(buildParameters: BuildParameters, workspace: string): Promise<void> {
-  const strategy = buildParameters.syncStrategy as SyncStrategy;
-  const resolvedStrategy = IncrementalSyncService.resolveStrategy(strategy, workspace, buildParameters.syncStatePath);
-
-  if (resolvedStrategy === 'full') {
-    core.info('[Sync] Resolved to full sync (no incremental state available)');
-
-    return;
-  }
-
-  switch (resolvedStrategy) {
-    case 'git-delta': {
-      const targetReference = buildParameters.gitSha || buildParameters.branch;
-      const changedFiles = await IncrementalSyncService.syncGitDelta(
-        workspace,
-        targetReference,
-        buildParameters.syncStatePath,
-      );
-      core.info(`[Sync] Git delta sync applied: ${changedFiles} file(s) changed`);
-      break;
-    }
-    case 'direct-input': {
-      if (!buildParameters.syncInputRef) {
-        throw new Error('[Sync] direct-input strategy requires syncInputRef to be set');
-      }
-      const overlays = await IncrementalSyncService.applyDirectInput(
-        workspace,
-        buildParameters.syncInputRef,
-        buildParameters.syncStorageRemote || undefined,
-        buildParameters.syncStatePath,
-      );
-      core.info(`[Sync] Direct input applied: ${overlays.length} overlay(s)`);
-      break;
-    }
-    case 'storage-pull': {
-      if (!buildParameters.syncInputRef) {
-        throw new Error('[Sync] storage-pull strategy requires syncInputRef to be set');
-      }
-      const pulledFiles = await IncrementalSyncService.syncStoragePull(workspace, buildParameters.syncInputRef, {
-        rcloneRemote: buildParameters.syncStorageRemote || undefined,
-        syncRevertAfter: buildParameters.syncRevertAfter,
-        statePath: buildParameters.syncStatePath,
-      });
-      core.info(`[Sync] Storage pull complete: ${pulledFiles.length} file(s)`);
-      break;
-    }
-    default:
-      core.warning(`[Sync] Unknown sync strategy: ${resolvedStrategy}`);
-  }
-}
-
 runMain();

src/integration/orchestrator-github-checks-integration-test.ts

@@ -1,29 +0,0 @@
-// Integration test for exercising real GitHub check creation and updates.
-import Orchestrator from '../model/orchestrator/orchestrator';
-import UnityVersioning from '../model/unity-versioning';
-import GitHub from '../model/github';
-import { TIMEOUT_INFINITE, createParameters } from '../test-utils/orchestrator-test-helpers';
-
-const runIntegration = process.env.RUN_GITHUB_INTEGRATION_TESTS === 'true';
-const describeOrSkip = runIntegration ? describe : describe.skip;
-
-describeOrSkip('Orchestrator Github Checks Integration', () => {
-  it(
-    'creates and updates a real GitHub check',
-    async () => {
-      const buildParameter = await createParameters({
-        versioning: 'None',
-        projectPath: 'test-project',
-        unityVersion: UnityVersioning.read('test-project'),
-        asyncOrchestrator: `true`,
-        githubChecks: `true`,
-      });
-      await Orchestrator.setup(buildParameter);
-      const checkId = await GitHub.createGitHubCheck(`integration create`);
-      expect(checkId).not.toEqual('');
-      await GitHub.updateGitHubCheck(`1 ${new Date().toISOString()}`, `integration`);
-      await GitHub.updateGitHubCheck(`2 ${new Date().toISOString()}`, `integration`, `success`, `completed`);
-    },
-    TIMEOUT_INFINITE,
-  );
-});

src/jest.globals.ts

@@ -1,3 +0,0 @@
-import { fetch as undiciFetch, Headers, Request, Response } from 'undici';
-
-Object.assign(globalThis, { fetch: undiciFetch, Headers, Request, Response });

src/model/build-parameters.ts

@@ -1,7 +1,7 @@
 import { customAlphabet } from 'nanoid';
 import AndroidVersioning from './android-versioning';
-import OrchestratorConstants from './orchestrator/options/orchestrator-constants';
+import CloudRunnerConstants from './cloud-runner/options/cloud-runner-constants';
-import OrchestratorBuildGuid from './orchestrator/options/orchestrator-guid';
+import CloudRunnerBuildGuid from './cloud-runner/options/cloud-runner-guid';
 import Input from './input';
 import Platform from './platform';
 import UnityVersioning from './unity-versioning';
@@ -10,8 +10,8 @@ import { GitRepoReader } from './input-readers/git-repo';
 import { GithubCliReader } from './input-readers/github-cli';
 import { Cli } from './cli/cli';
 import GitHub from './github';
-import OrchestratorOptions from './orchestrator/options/orchestrator-options';
+import CloudRunnerOptions from './cloud-runner/options/cloud-runner-options';
-import Orchestrator from './orchestrator/orchestrator';
+import CloudRunner from './cloud-runner/cloud-runner';
 import * as core from '@actions/core';
 
 class BuildParameters {
@@ -56,18 +56,9 @@ class BuildParameters {
   public providerStrategy!: string;
   public gitPrivateToken!: string;
   public awsStackName!: string;
-  public awsEndpoint?: string;
-  public awsCloudFormationEndpoint?: string;
-  public awsEcsEndpoint?: string;
-  public awsKinesisEndpoint?: string;
-  public awsCloudWatchLogsEndpoint?: string;
-  public awsS3Endpoint?: string;
-  public storageProvider!: string;
-  public rcloneRemote!: string;
   public kubeConfig!: string;
   public containerMemory!: string;
   public containerCpu!: string;
-  public containerNamespace!: string;
   public kubeVolumeSize!: string;
   public kubeVolume!: string;
   public kubeStorageClass!: string;
@@ -84,13 +75,11 @@ class BuildParameters {
   public runNumber!: string;
   public branch!: string;
   public githubRepo!: string;
-  public orchestratorRepoName!: string;
-  public cloneDepth!: number;
   public gitSha!: string;
   public logId!: string;
   public buildGuid!: string;
-  public orchestratorBranch!: string;
+  public cloudRunnerBranch!: string;
-  public orchestratorDebug!: boolean | undefined;
+  public cloudRunnerDebug!: boolean | undefined;
   public buildPlatform!: string | undefined;
   public isCliMode!: boolean;
   public maxRetainedWorkspaces!: number;
@@ -106,14 +95,9 @@ class BuildParameters {
   public cacheUnityInstallationOnMac!: boolean;
   public unityHubVersionOnMac!: string;
   public dockerWorkspacePath!: string;
-  public syncStrategy!: string;
-  public syncInputRef!: string;
-  public syncStorageRemote!: string;
-  public syncRevertAfter!: boolean;
-  public syncStatePath!: string;
 
   public static shouldUseRetainedWorkspaceMode(buildParameters: BuildParameters) {
-    return buildParameters.maxRetainedWorkspaces > 0 && Orchestrator.lockedWorkspace !== ``;
+    return buildParameters.maxRetainedWorkspaces > 0 && CloudRunner.lockedWorkspace !== ``;
   }
 
   static async create(): Promise<BuildParameters> {
@@ -198,60 +182,44 @@ class BuildParameters {
       dockerIsolationMode: Input.dockerIsolationMode,
       containerRegistryRepository: Input.containerRegistryRepository,
       containerRegistryImageVersion: Input.containerRegistryImageVersion,
-      providerStrategy: OrchestratorOptions.providerStrategy,
+      providerStrategy: CloudRunnerOptions.providerStrategy,
-      buildPlatform: OrchestratorOptions.buildPlatform,
+      buildPlatform: CloudRunnerOptions.buildPlatform,
-      kubeConfig: OrchestratorOptions.kubeConfig,
+      kubeConfig: CloudRunnerOptions.kubeConfig,
-      containerMemory: OrchestratorOptions.containerMemory,
+      containerMemory: CloudRunnerOptions.containerMemory,
-      containerCpu: OrchestratorOptions.containerCpu,
+      containerCpu: CloudRunnerOptions.containerCpu,
-      containerNamespace: OrchestratorOptions.containerNamespace,
+      kubeVolumeSize: CloudRunnerOptions.kubeVolumeSize,
-      kubeVolumeSize: OrchestratorOptions.kubeVolumeSize,
+      kubeVolume: CloudRunnerOptions.kubeVolume,
-      kubeVolume: OrchestratorOptions.kubeVolume,
+      postBuildContainerHooks: CloudRunnerOptions.postBuildContainerHooks,
-      postBuildContainerHooks: OrchestratorOptions.postBuildContainerHooks,
+      preBuildContainerHooks: CloudRunnerOptions.preBuildContainerHooks,
-      preBuildContainerHooks: OrchestratorOptions.preBuildContainerHooks,
+      customJob: CloudRunnerOptions.customJob,
-      customJob: OrchestratorOptions.customJob,
       runNumber: Input.runNumber,
       branch: Input.branch.replace('/head', '') || (await GitRepoReader.GetBranch()),
-      orchestratorBranch: OrchestratorOptions.orchestratorBranch.split('/').reverse()[0],
+      cloudRunnerBranch: CloudRunnerOptions.cloudRunnerBranch.split('/').reverse()[0],
-      orchestratorDebug: OrchestratorOptions.orchestratorDebug,
+      cloudRunnerDebug: CloudRunnerOptions.cloudRunnerDebug,
-      githubRepo: (Input.githubRepo ?? (await GitRepoReader.GetRemote())) || OrchestratorOptions.orchestratorRepoName,
+      githubRepo: (Input.githubRepo ?? (await GitRepoReader.GetRemote())) || 'game-ci/unity-builder',
-      orchestratorRepoName: OrchestratorOptions.orchestratorRepoName,
-      cloneDepth: Number.parseInt(OrchestratorOptions.cloneDepth),
       isCliMode: Cli.isCliMode,
-      awsStackName: OrchestratorOptions.awsStackName,
+      awsStackName: CloudRunnerOptions.awsStackName,
-      awsEndpoint: OrchestratorOptions.awsEndpoint,
-      awsCloudFormationEndpoint: OrchestratorOptions.awsCloudFormationEndpoint,
-      awsEcsEndpoint: OrchestratorOptions.awsEcsEndpoint,
-      awsKinesisEndpoint: OrchestratorOptions.awsKinesisEndpoint,
-      awsCloudWatchLogsEndpoint: OrchestratorOptions.awsCloudWatchLogsEndpoint,
-      awsS3Endpoint: OrchestratorOptions.awsS3Endpoint,
-      storageProvider: OrchestratorOptions.storageProvider,
-      rcloneRemote: OrchestratorOptions.rcloneRemote,
       gitSha: Input.gitSha,
-      logId: customAlphabet(OrchestratorConstants.alphabet, 9)(),
+      logId: customAlphabet(CloudRunnerConstants.alphabet, 9)(),
-      buildGuid: OrchestratorBuildGuid.generateGuid(Input.runNumber, Input.targetPlatform),
+      buildGuid: CloudRunnerBuildGuid.generateGuid(Input.runNumber, Input.targetPlatform),
-      commandHooks: OrchestratorOptions.commandHooks,
+      commandHooks: CloudRunnerOptions.commandHooks,
-      inputPullCommand: OrchestratorOptions.inputPullCommand,
+      inputPullCommand: CloudRunnerOptions.inputPullCommand,
-      pullInputList: OrchestratorOptions.pullInputList,
+      pullInputList: CloudRunnerOptions.pullInputList,
-      kubeStorageClass: OrchestratorOptions.kubeStorageClass,
+      kubeStorageClass: CloudRunnerOptions.kubeStorageClass,
-      cacheKey: OrchestratorOptions.cacheKey,
+      cacheKey: CloudRunnerOptions.cacheKey,
-      maxRetainedWorkspaces: Number.parseInt(OrchestratorOptions.maxRetainedWorkspaces),
+      maxRetainedWorkspaces: Number.parseInt(CloudRunnerOptions.maxRetainedWorkspaces),
-      useLargePackages: OrchestratorOptions.useLargePackages,
+      useLargePackages: CloudRunnerOptions.useLargePackages,
-      useCompressionStrategy: OrchestratorOptions.useCompressionStrategy,
+      useCompressionStrategy: CloudRunnerOptions.useCompressionStrategy,
-      garbageMaxAge: OrchestratorOptions.garbageMaxAge,
+      garbageMaxAge: CloudRunnerOptions.garbageMaxAge,
-      githubChecks: OrchestratorOptions.githubChecks,
+      githubChecks: CloudRunnerOptions.githubChecks,
-      asyncWorkflow: OrchestratorOptions.asyncOrchestrator,
+      asyncWorkflow: CloudRunnerOptions.asyncCloudRunner,
-      githubCheckId: OrchestratorOptions.githubCheckId,
+      githubCheckId: CloudRunnerOptions.githubCheckId,
-      finalHooks: OrchestratorOptions.finalHooks,
+      finalHooks: CloudRunnerOptions.finalHooks,
-      skipLfs: OrchestratorOptions.skipLfs,
+      skipLfs: CloudRunnerOptions.skipLfs,
-      skipCache: OrchestratorOptions.skipCache,
+      skipCache: CloudRunnerOptions.skipCache,
       cacheUnityInstallationOnMac: Input.cacheUnityInstallationOnMac,
       unityHubVersionOnMac: Input.unityHubVersionOnMac,
       dockerWorkspacePath: Input.dockerWorkspacePath,
-      syncStrategy: Input.syncStrategy,
-      syncInputRef: Input.syncInputRef,
-      syncStorageRemote: Input.syncStorageRemote,
-      syncRevertAfter: Input.syncRevertAfter,
-      syncStatePath: Input.syncStatePath,
     };
   }
 

src/model/cli/cli.ts

@@ -1,14 +1,14 @@
 import { Command } from 'commander-ts';
-import { BuildParameters, Orchestrator, ImageTag, Input } from '..';
+import { BuildParameters, CloudRunner, ImageTag, Input } from '..';
 import * as core from '@actions/core';
 import { ActionYamlReader } from '../input-readers/action-yaml';
-import OrchestratorLogger from '../orchestrator/services/core/orchestrator-logger';
+import CloudRunnerLogger from '../cloud-runner/services/core/cloud-runner-logger';
-import OrchestratorQueryOverride from '../orchestrator/options/orchestrator-query-override';
+import CloudRunnerQueryOverride from '../cloud-runner/options/cloud-runner-query-override';
 import { CliFunction, CliFunctionsRepository } from './cli-functions-repository';
-import { Caching } from '../orchestrator/remote-client/caching';
+import { Caching } from '../cloud-runner/remote-client/caching';
-import { LfsHashing } from '../orchestrator/services/utility/lfs-hashing';
+import { LfsHashing } from '../cloud-runner/services/utility/lfs-hashing';
-import { RemoteClient } from '../orchestrator/remote-client';
+import { RemoteClient } from '../cloud-runner/remote-client';
-import OrchestratorOptionsReader from '../orchestrator/options/orchestrator-options-reader';
+import CloudRunnerOptionsReader from '../cloud-runner/options/cloud-runner-options-reader';
 import GitHub from '../github';
 import { OptionValues } from 'commander';
 import { InputKey } from '../input';
@@ -36,7 +36,7 @@ export class Cli {
     const program = new Command();
     program.version('0.0.1');
 
-    const properties = OrchestratorOptionsReader.GetProperties();
+    const properties = CloudRunnerOptionsReader.GetProperties();
     const actionYamlReader: ActionYamlReader = new ActionYamlReader();
     for (const element of properties) {
       program.option(`--${element} <${element}>`, actionYamlReader.GetActionYamlValue(element));
@@ -62,23 +62,23 @@ export class Cli {
   static async RunCli(): Promise<void> {
     GitHub.githubInputEnabled = false;
     if (Cli.options!['populateOverride'] === `true`) {
-      await OrchestratorQueryOverride.PopulateQueryOverrideInput();
+      await CloudRunnerQueryOverride.PopulateQueryOverrideInput();
     }
     if (Cli.options!['logInput']) {
       Cli.logInput();
     }
     const results = CliFunctionsRepository.GetCliFunctions(Cli.options?.mode);
-    OrchestratorLogger.log(`Entrypoint: ${results.key}`);
+    CloudRunnerLogger.log(`Entrypoint: ${results.key}`);
     Cli.options!.versioning = 'None';
 
-    Orchestrator.buildParameters = await BuildParameters.create();
+    CloudRunner.buildParameters = await BuildParameters.create();
-    Orchestrator.buildParameters.buildGuid = process.env.BUILD_GUID || ``;
+    CloudRunner.buildParameters.buildGuid = process.env.BUILD_GUID || ``;
-    OrchestratorLogger.log(`Build Params:
+    CloudRunnerLogger.log(`Build Params:
-      ${JSON.stringify(Orchestrator.buildParameters, undefined, 4)}
+      ${JSON.stringify(CloudRunner.buildParameters, undefined, 4)}
     `);
-    Orchestrator.lockedWorkspace = process.env.LOCKED_WORKSPACE || ``;
+    CloudRunner.lockedWorkspace = process.env.LOCKED_WORKSPACE || ``;
-    OrchestratorLogger.log(`Locked Workspace: ${Orchestrator.lockedWorkspace}`);
+    CloudRunnerLogger.log(`Locked Workspace: ${CloudRunner.lockedWorkspace}`);
-    await Orchestrator.setup(Orchestrator.buildParameters);
+    await CloudRunner.setup(CloudRunner.buildParameters);
 
     return await results.target[results.propertyKey](Cli.options);
   }
@@ -87,7 +87,7 @@ export class Cli {
   private static logInput() {
     core.info(`\n`);
     core.info(`INPUT:`);
-    const properties = OrchestratorOptionsReader.GetProperties();
+    const properties = CloudRunnerOptionsReader.GetProperties();
     for (const element of properties) {
       if (
         element in Input &&
@@ -104,28 +104,28 @@ export class Cli {
     core.info(`\n`);
   }
 
-  @CliFunction(`cli-build`, `runs a orchestrator build`)
+  @CliFunction(`cli-build`, `runs a cloud runner build`)
   public static async CLIBuild(): Promise<string> {
     const buildParameter = await BuildParameters.create();
     const baseImage = new ImageTag(buildParameter);
 
-    return (await Orchestrator.run(buildParameter, baseImage.toString())).BuildResults;
+    return (await CloudRunner.run(buildParameter, baseImage.toString())).BuildResults;
   }
 
-  @CliFunction(`async-workflow`, `runs a orchestrator build`)
+  @CliFunction(`async-workflow`, `runs a cloud runner build`)
   public static async asyncronousWorkflow(): Promise<string> {
     const buildParameter = await BuildParameters.create();
     const baseImage = new ImageTag(buildParameter);
-    await Orchestrator.setup(buildParameter);
+    await CloudRunner.setup(buildParameter);
 
-    return (await Orchestrator.run(buildParameter, baseImage.toString())).BuildResults;
+    return (await CloudRunner.run(buildParameter, baseImage.toString())).BuildResults;
   }
 
-  @CliFunction(`checks-update`, `runs a orchestrator build`)
+  @CliFunction(`checks-update`, `runs a cloud runner build`)
   public static async checksUpdate() {
     const buildParameter = await BuildParameters.create();
 
-    await Orchestrator.setup(buildParameter);
+    await CloudRunner.setup(buildParameter);
     const input = JSON.parse(process.env.CHECKS_UPDATE || ``);
     core.info(`Checks Update ${process.env.CHECKS_UPDATE}`);
     if (input.mode === `create`) {
@@ -139,18 +139,18 @@ export class Cli {
   public static async GarbageCollect(): Promise<string> {
     const buildParameter = await BuildParameters.create();
 
-    await Orchestrator.setup(buildParameter);
+    await CloudRunner.setup(buildParameter);
 
-    return await Orchestrator.Provider.garbageCollect(``, false, 0, false, false);
+    return await CloudRunner.Provider.garbageCollect(``, false, 0, false, false);
   }
 
   @CliFunction(`list-resources`, `lists active resources`)
   public static async ListResources(): Promise<string[]> {
     const buildParameter = await BuildParameters.create();
 
-    await Orchestrator.setup(buildParameter);
+    await CloudRunner.setup(buildParameter);
-    const result = await Orchestrator.Provider.listResources();
+    const result = await CloudRunner.Provider.listResources();
-    OrchestratorLogger.log(JSON.stringify(result, undefined, 4));
+    CloudRunnerLogger.log(JSON.stringify(result, undefined, 4));
 
     return result.map((x) => x.Name);
   }
@@ -159,17 +159,17 @@ export class Cli {
   public static async ListWorfklow(): Promise<string[]> {
     const buildParameter = await BuildParameters.create();
 
-    await Orchestrator.setup(buildParameter);
+    await CloudRunner.setup(buildParameter);
 
-    return (await Orchestrator.Provider.listWorkflow()).map((x) => x.Name);
+    return (await CloudRunner.Provider.listWorkflow()).map((x) => x.Name);
   }
 
   @CliFunction(`watch`, `follows logs of a running workflow`)
   public static async Watch(): Promise<string> {
     const buildParameter = await BuildParameters.create();
 
-    await Orchestrator.setup(buildParameter);
+    await CloudRunner.setup(buildParameter);
 
-    return await Orchestrator.Provider.watchWorkflow();
+    return await CloudRunner.Provider.watchWorkflow();
   }
 }

src/model/cloud-runner/cloud-runner.ts

@@ -0,0 +1,187 @@
+import AwsBuildPlatform from './providers/aws';
+import { BuildParameters, Input } from '..';
+import Kubernetes from './providers/k8s';
+import CloudRunnerLogger from './services/core/cloud-runner-logger';
+import { CloudRunnerStepParameters } from './options/cloud-runner-step-parameters';
+import { WorkflowCompositionRoot } from './workflows/workflow-composition-root';
+import { CloudRunnerError } from './error/cloud-runner-error';
+import { TaskParameterSerializer } from './services/core/task-parameter-serializer';
+import * as core from '@actions/core';
+import CloudRunnerSecret from './options/cloud-runner-secret';
+import { ProviderInterface } from './providers/provider-interface';
+import CloudRunnerEnvironmentVariable from './options/cloud-runner-environment-variable';
+import TestCloudRunner from './providers/test';
+import LocalCloudRunner from './providers/local';
+import LocalDockerCloudRunner from './providers/docker';
+import GitHub from '../github';
+import SharedWorkspaceLocking from './services/core/shared-workspace-locking';
+import { FollowLogStreamService } from './services/core/follow-log-stream-service';
+import CloudRunnerResult from './services/core/cloud-runner-result';
+
+class CloudRunner {
+  public static Provider: ProviderInterface;
+  public static buildParameters: BuildParameters;
+  private static defaultSecrets: CloudRunnerSecret[];
+  private static cloudRunnerEnvironmentVariables: CloudRunnerEnvironmentVariable[];
+  static lockedWorkspace: string = ``;
+  public static readonly retainedWorkspacePrefix: string = `retained-workspace`;
+  public static get isCloudRunnerEnvironment() {
+    return process.env[`GITHUB_ACTIONS`] !== `true`;
+  }
+  public static get isCloudRunnerAsyncEnvironment() {
+    return process.env[`ASYNC_WORKFLOW`] === `true`;
+  }
+  public static async setup(buildParameters: BuildParameters) {
+    CloudRunnerLogger.setup();
+    CloudRunnerLogger.log(`Setting up cloud runner`);
+    CloudRunner.buildParameters = buildParameters;
+    if (CloudRunner.buildParameters.githubCheckId === ``) {
+      CloudRunner.buildParameters.githubCheckId = await GitHub.createGitHubCheck(CloudRunner.buildParameters.buildGuid);
+    }
+    CloudRunner.setupSelectedBuildPlatform();
+    CloudRunner.defaultSecrets = TaskParameterSerializer.readDefaultSecrets();
+    CloudRunner.cloudRunnerEnvironmentVariables =
+      TaskParameterSerializer.createCloudRunnerEnvironmentVariables(buildParameters);
+    if (GitHub.githubInputEnabled) {
+      const buildParameterPropertyNames = Object.getOwnPropertyNames(buildParameters);
+      for (const element of CloudRunner.cloudRunnerEnvironmentVariables) {
+        // CloudRunnerLogger.log(`Cloud Runner output ${Input.ToEnvVarFormat(element.name)} = ${element.value}`);
+        core.setOutput(Input.ToEnvVarFormat(element.name), element.value);
+      }
+      for (const element of buildParameterPropertyNames) {
+        // CloudRunnerLogger.log(`Cloud Runner output ${Input.ToEnvVarFormat(element)} = ${buildParameters[element]}`);
+        core.setOutput(Input.ToEnvVarFormat(element), buildParameters[element]);
+      }
+      core.setOutput(
+        Input.ToEnvVarFormat(`buildArtifact`),
+        `build-${CloudRunner.buildParameters.buildGuid}.tar${
+          CloudRunner.buildParameters.useCompressionStrategy ? '.lz4' : ''
+        }`,
+      );
+    }
+    FollowLogStreamService.Reset();
+  }
+
+  private static setupSelectedBuildPlatform() {
+    CloudRunnerLogger.log(`Cloud Runner platform selected ${CloudRunner.buildParameters.providerStrategy}`);
+    switch (CloudRunner.buildParameters.providerStrategy) {
+      case 'k8s':
+        CloudRunner.Provider = new Kubernetes(CloudRunner.buildParameters);
+        break;
+      case 'aws':
+        CloudRunner.Provider = new AwsBuildPlatform(CloudRunner.buildParameters);
+        break;
+      case 'test':
+        CloudRunner.Provider = new TestCloudRunner();
+        break;
+      case 'local-docker':
+        CloudRunner.Provider = new LocalDockerCloudRunner();
+        break;
+      case 'local-system':
+        CloudRunner.Provider = new LocalCloudRunner();
+        break;
+    }
+  }
+
+  static async run(buildParameters: BuildParameters, baseImage: string) {
+    if (baseImage.includes(`undefined`)) {
+      throw new Error(`baseImage is undefined`);
+    }
+    await CloudRunner.setup(buildParameters);
+    await CloudRunner.Provider.setupWorkflow(
+      CloudRunner.buildParameters.buildGuid,
+      CloudRunner.buildParameters,
+      CloudRunner.buildParameters.branch,
+      CloudRunner.defaultSecrets,
+    );
+    try {
+      if (buildParameters.maxRetainedWorkspaces > 0) {
+        CloudRunner.lockedWorkspace = SharedWorkspaceLocking.NewWorkspaceName();
+
+        const result = await SharedWorkspaceLocking.GetLockedWorkspace(
+          CloudRunner.lockedWorkspace,
+          CloudRunner.buildParameters.buildGuid,
+          CloudRunner.buildParameters,
+        );
+
+        if (result) {
+          CloudRunnerLogger.logLine(`Using retained workspace ${CloudRunner.lockedWorkspace}`);
+          CloudRunner.cloudRunnerEnvironmentVariables = [
+            ...CloudRunner.cloudRunnerEnvironmentVariables,
+            { name: `LOCKED_WORKSPACE`, value: CloudRunner.lockedWorkspace },
+          ];
+        } else {
+          CloudRunnerLogger.log(`Max retained workspaces reached ${buildParameters.maxRetainedWorkspaces}`);
+          buildParameters.maxRetainedWorkspaces = 0;
+          CloudRunner.lockedWorkspace = ``;
+        }
+      }
+      await CloudRunner.updateStatusWithBuildParameters();
+      const output = await new WorkflowCompositionRoot().run(
+        new CloudRunnerStepParameters(
+          baseImage,
+          CloudRunner.cloudRunnerEnvironmentVariables,
+          CloudRunner.defaultSecrets,
+        ),
+      );
+      await CloudRunner.Provider.cleanupWorkflow(
+        CloudRunner.buildParameters,
+        CloudRunner.buildParameters.branch,
+        CloudRunner.defaultSecrets,
+      );
+      if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
+      if (buildParameters.asyncWorkflow && this.isCloudRunnerEnvironment && this.isCloudRunnerAsyncEnvironment) {
+        await GitHub.updateGitHubCheck(CloudRunner.buildParameters.buildGuid, `success`, `success`, `completed`);
+      }
+
+      if (BuildParameters.shouldUseRetainedWorkspaceMode(buildParameters)) {
+        const workspace = CloudRunner.lockedWorkspace || ``;
+        await SharedWorkspaceLocking.ReleaseWorkspace(
+          workspace,
+          CloudRunner.buildParameters.buildGuid,
+          CloudRunner.buildParameters,
+        );
+        const isLocked = await SharedWorkspaceLocking.IsWorkspaceLocked(workspace, CloudRunner.buildParameters);
+        if (isLocked) {
+          throw new Error(
+            `still locked after releasing ${await SharedWorkspaceLocking.GetAllLocksForWorkspace(
+              workspace,
+              buildParameters,
+            )}`,
+          );
+        }
+        CloudRunner.lockedWorkspace = ``;
+      }
+
+      await GitHub.triggerWorkflowOnComplete(CloudRunner.buildParameters.finalHooks);
+
+      if (buildParameters.constantGarbageCollection) {
+        CloudRunner.Provider.garbageCollect(``, true, buildParameters.garbageMaxAge, true, true);
+      }
+
+      return new CloudRunnerResult(buildParameters, output, true, true, false);
+    } catch (error: any) {
+      CloudRunnerLogger.log(JSON.stringify(error, undefined, 4));
+      await GitHub.updateGitHubCheck(
+        CloudRunner.buildParameters.buildGuid,
+        `Failed - Error ${error?.message || error}`,
+        `failure`,
+        `completed`,
+      );
+      if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
+      await CloudRunnerError.handleException(error, CloudRunner.buildParameters, CloudRunner.defaultSecrets);
+      throw error;
+    }
+  }
+
+  private static async updateStatusWithBuildParameters() {
+    const content = { ...CloudRunner.buildParameters };
+    content.gitPrivateToken = ``;
+    content.unitySerial = ``;
+    content.unityEmail = ``;
+    content.unityPassword = ``;
+    const jsonContent = JSON.stringify(content, undefined, 4);
+    await GitHub.updateGitHubCheck(jsonContent, CloudRunner.buildParameters.buildGuid);
+  }
+}
+export default CloudRunner;

src/model/cloud-runner/error/cloud-runner-error.ts

@@ -0,0 +1,15 @@
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
+import * as core from '@actions/core';
+import CloudRunner from '../cloud-runner';
+import CloudRunnerSecret from '../options/cloud-runner-secret';
+import BuildParameters from '../../build-parameters';
+
+export class CloudRunnerError {
+  public static async handleException(error: unknown, buildParameters: BuildParameters, secrets: CloudRunnerSecret[]) {
+    CloudRunnerLogger.error(JSON.stringify(error, undefined, 4));
+    core.setFailed('Cloud Runner failed');
+    if (CloudRunner.Provider !== undefined) {
+      await CloudRunner.Provider.cleanupWorkflow(buildParameters, buildParameters.branch, secrets);
+    }
+  }
+}

src/model/cloud-runner/options/cloud-runner-constants.ts

@@ -0,0 +1,4 @@
+class CloudRunnerConstants {
+  static alphabet = '0123456789abcdefghijklmnopqrstuvwxyz';
+}
+export default CloudRunnerConstants;

src/model/cloud-runner/options/cloud-runner-environment-variable.ts

@@ -0,0 +1,5 @@
+class CloudRunnerEnvironmentVariable {
+  public name!: string;
+  public value!: string;
+}
+export default CloudRunnerEnvironmentVariable;

src/model/cloud-runner/options/cloud-runner-folders.ts

@@ -0,0 +1,90 @@
+import path from 'node:path';
+import CloudRunnerOptions from './cloud-runner-options';
+import CloudRunner from '../cloud-runner';
+import BuildParameters from '../../build-parameters';
+
+export class CloudRunnerFolders {
+  public static readonly repositoryFolder = 'repo';
+
+  public static ToLinuxFolder(folder: string) {
+    return folder.replace(/\\/g, `/`);
+  }
+
+  // Only the following paths that do not start a path.join with another "Full" suffixed property need to start with an absolute /
+
+  public static get uniqueCloudRunnerJobFolderAbsolute(): string {
+    return CloudRunner.buildParameters && BuildParameters.shouldUseRetainedWorkspaceMode(CloudRunner.buildParameters)
+      ? path.join(`/`, CloudRunnerFolders.buildVolumeFolder, CloudRunner.lockedWorkspace)
+      : path.join(`/`, CloudRunnerFolders.buildVolumeFolder, CloudRunner.buildParameters.buildGuid);
+  }
+
+  public static get cacheFolderForAllFull(): string {
+    return path.join('/', CloudRunnerFolders.buildVolumeFolder, CloudRunnerFolders.cacheFolder);
+  }
+
+  public static get cacheFolderForCacheKeyFull(): string {
+    return path.join(
+      '/',
+      CloudRunnerFolders.buildVolumeFolder,
+      CloudRunnerFolders.cacheFolder,
+      CloudRunner.buildParameters.cacheKey,
+    );
+  }
+
+  public static get builderPathAbsolute(): string {
+    return path.join(
+      CloudRunnerOptions.useSharedBuilder
+        ? `/${CloudRunnerFolders.buildVolumeFolder}`
+        : CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute,
+      `builder`,
+    );
+  }
+
+  public static get repoPathAbsolute(): string {
+    return path.join(CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute, CloudRunnerFolders.repositoryFolder);
+  }
+
+  public static get projectPathAbsolute(): string {
+    return path.join(CloudRunnerFolders.repoPathAbsolute, CloudRunner.buildParameters.projectPath);
+  }
+
+  public static get libraryFolderAbsolute(): string {
+    return path.join(CloudRunnerFolders.projectPathAbsolute, `Library`);
+  }
+
+  public static get projectBuildFolderAbsolute(): string {
+    return path.join(CloudRunnerFolders.repoPathAbsolute, CloudRunner.buildParameters.buildPath);
+  }
+
+  public static get lfsFolderAbsolute(): string {
+    return path.join(CloudRunnerFolders.repoPathAbsolute, `.git`, `lfs`);
+  }
+
+  public static get purgeRemoteCaching(): boolean {
+    return process.env.PURGE_REMOTE_BUILDER_CACHE !== undefined;
+  }
+
+  public static get lfsCacheFolderFull() {
+    return path.join(CloudRunnerFolders.cacheFolderForCacheKeyFull, `lfs`);
+  }
+
+  public static get libraryCacheFolderFull() {
+    return path.join(CloudRunnerFolders.cacheFolderForCacheKeyFull, `Library`);
+  }
+
+  public static get unityBuilderRepoUrl(): string {
+    return `https://${CloudRunner.buildParameters.gitPrivateToken}@github.com/game-ci/unity-builder.git`;
+  }
+
+  public static get targetBuildRepoUrl(): string {
+    return `https://${CloudRunner.buildParameters.gitPrivateToken}@github.com/${CloudRunner.buildParameters.githubRepo}.git`;
+  }
+
+  public static get buildVolumeFolder() {
+    return 'data';
+  }
+
+  public static get cacheFolder() {
+    return 'cache';
+  }
+}

src/model/cloud-runner/options/cloud-runner-guid.ts

@@ -1,11 +1,11 @@
 import { customAlphabet } from 'nanoid';
-import OrchestratorConstants from './orchestrator-constants';
+import CloudRunnerConstants from './cloud-runner-constants';
 
-class OrchestratorNamespace {
+class CloudRunnerNamespace {
   static generateGuid(runNumber: string | number, platform: string) {
-    const nanoid = customAlphabet(OrchestratorConstants.alphabet, 4);
+    const nanoid = customAlphabet(CloudRunnerConstants.alphabet, 4);
 
     return `${runNumber}-${platform.toLowerCase().replace('standalone', '')}-${nanoid()}`;
   }
 }
-export default OrchestratorNamespace;
+export default CloudRunnerNamespace;

src/model/cloud-runner/options/cloud-runner-options-reader.ts

@@ -0,0 +1,10 @@
+import Input from '../../input';
+import CloudRunnerOptions from './cloud-runner-options';
+
+class CloudRunnerOptionsReader {
+  static GetProperties() {
+    return [...Object.getOwnPropertyNames(Input), ...Object.getOwnPropertyNames(CloudRunnerOptions)];
+  }
+}
+
+export default CloudRunnerOptionsReader;

src/model/cloud-runner/options/cloud-runner-options.ts

@@ -0,0 +1,283 @@
+import { Cli } from '../../cli/cli';
+import CloudRunnerQueryOverride from './cloud-runner-query-override';
+import GitHub from '../../github';
+import * as core from '@actions/core';
+
+class CloudRunnerOptions {
+  // ### ### ###
+  // Input Handling
+  // ### ### ###
+  public static getInput(query: string): string | undefined {
+    if (GitHub.githubInputEnabled) {
+      const coreInput = core.getInput(query);
+      if (coreInput && coreInput !== '') {
+        return coreInput;
+      }
+    }
+    const alternativeQuery = CloudRunnerOptions.ToEnvVarFormat(query);
+
+    // Query input sources
+    if (Cli.query(query, alternativeQuery)) {
+      return Cli.query(query, alternativeQuery);
+    }
+
+    if (CloudRunnerQueryOverride.query(query, alternativeQuery)) {
+      return CloudRunnerQueryOverride.query(query, alternativeQuery);
+    }
+
+    if (process.env[query] !== undefined) {
+      return process.env[query];
+    }
+
+    if (alternativeQuery !== query && process.env[alternativeQuery] !== undefined) {
+      return process.env[alternativeQuery];
+    }
+  }
+
+  public static ToEnvVarFormat(input: string): string {
+    if (input.toUpperCase() === input) {
+      return input;
+    }
+
+    return input
+      .replace(/([A-Z])/g, ' $1')
+      .trim()
+      .toUpperCase()
+      .replace(/ /g, '_');
+  }
+
+  // ### ### ###
+  // Provider parameters
+  // ### ### ###
+
+  static get region(): string {
+    return CloudRunnerOptions.getInput('region') || 'eu-west-2';
+  }
+
+  // ### ### ###
+  // GitHub  parameters
+  // ### ### ###
+  static get githubChecks(): boolean {
+    const value = CloudRunnerOptions.getInput('githubChecks');
+
+    return value === `true` || false;
+  }
+  static get githubCheckId(): string {
+    return CloudRunnerOptions.getInput('githubCheckId') || ``;
+  }
+
+  static get githubOwner(): string {
+    return CloudRunnerOptions.getInput('githubOwner') || CloudRunnerOptions.githubRepo?.split(`/`)[0] || '';
+  }
+
+  static get githubRepoName(): string {
+    return CloudRunnerOptions.getInput('githubRepoName') || CloudRunnerOptions.githubRepo?.split(`/`)[1] || '';
+  }
+
+  static get finalHooks(): string[] {
+    return CloudRunnerOptions.getInput('finalHooks')?.split(',') || [];
+  }
+
+  // ### ### ###
+  // Git syncronization parameters
+  // ### ### ###
+
+  static get githubRepo(): string | undefined {
+    return CloudRunnerOptions.getInput('GITHUB_REPOSITORY') || CloudRunnerOptions.getInput('GITHUB_REPO') || undefined;
+  }
+  static get branch(): string {
+    if (CloudRunnerOptions.getInput(`GITHUB_REF`)) {
+      return (
+        CloudRunnerOptions.getInput(`GITHUB_REF`)?.replace('refs/', '').replace(`head/`, '').replace(`heads/`, '') || ``
+      );
+    } else if (CloudRunnerOptions.getInput('branch')) {
+      return CloudRunnerOptions.getInput('branch') || ``;
+    } else {
+      return '';
+    }
+  }
+
+  // ### ### ###
+  // Cloud Runner parameters
+  // ### ### ###
+
+  static get buildPlatform(): string {
+    const input = CloudRunnerOptions.getInput('buildPlatform');
+    if (input && input !== '') {
+      return input;
+    }
+    if (CloudRunnerOptions.providerStrategy !== 'local') {
+      return 'linux';
+    }
+
+    return process.platform;
+  }
+
+  static get cloudRunnerBranch(): string {
+    return CloudRunnerOptions.getInput('cloudRunnerBranch') || 'main';
+  }
+
+  static get providerStrategy(): string {
+    const provider =
+      CloudRunnerOptions.getInput('cloudRunnerCluster') || CloudRunnerOptions.getInput('providerStrategy');
+    if (Cli.isCliMode) {
+      return provider || 'aws';
+    }
+
+    return provider || 'local';
+  }
+
+  static get containerCpu(): string {
+    return CloudRunnerOptions.getInput('containerCpu') || `1024`;
+  }
+
+  static get containerMemory(): string {
+    return CloudRunnerOptions.getInput('containerMemory') || `3072`;
+  }
+
+  static get customJob(): string {
+    return CloudRunnerOptions.getInput('customJob') || '';
+  }
+
+  // ### ### ###
+  // Custom commands from files parameters
+  // ### ### ###
+
+  static get containerHookFiles(): string[] {
+    return CloudRunnerOptions.getInput('containerHookFiles')?.split(`,`) || [];
+  }
+
+  static get commandHookFiles(): string[] {
+    return CloudRunnerOptions.getInput('commandHookFiles')?.split(`,`) || [];
+  }
+
+  // ### ### ###
+  // Custom commands from yaml parameters
+  // ### ### ###
+
+  static get commandHooks(): string {
+    return CloudRunnerOptions.getInput('commandHooks') || '';
+  }
+
+  static get postBuildContainerHooks(): string {
+    return CloudRunnerOptions.getInput('postBuildContainerHooks') || '';
+  }
+
+  static get preBuildContainerHooks(): string {
+    return CloudRunnerOptions.getInput('preBuildContainerHooks') || '';
+  }
+
+  // ### ### ###
+  // Input override handling
+  // ### ### ###
+
+  static get pullInputList(): string[] {
+    return CloudRunnerOptions.getInput('pullInputList')?.split(`,`) || [];
+  }
+
+  static get inputPullCommand(): string {
+    const value = CloudRunnerOptions.getInput('inputPullCommand');
+
+    if (value === 'gcp-secret-manager') {
+      return 'gcloud secrets versions access 1 --secret="{0}"';
+    } else if (value === 'aws-secret-manager') {
+      return 'aws secretsmanager get-secret-value --secret-id {0}';
+    }
+
+    return value || '';
+  }
+
+  // ### ### ###
+  // Aws
+  // ### ### ###
+
+  static get awsStackName() {
+    return CloudRunnerOptions.getInput('awsStackName') || 'game-ci';
+  }
+
+  // ### ### ###
+  // K8s
+  // ### ### ###
+
+  static get kubeConfig(): string {
+    return CloudRunnerOptions.getInput('kubeConfig') || '';
+  }
+
+  static get kubeVolume(): string {
+    return CloudRunnerOptions.getInput('kubeVolume') || '';
+  }
+
+  static get kubeVolumeSize(): string {
+    return CloudRunnerOptions.getInput('kubeVolumeSize') || '25Gi';
+  }
+
+  static get kubeStorageClass(): string {
+    return CloudRunnerOptions.getInput('kubeStorageClass') || '';
+  }
+
+  // ### ### ###
+  // Caching
+  // ### ### ###
+
+  static get cacheKey(): string {
+    return CloudRunnerOptions.getInput('cacheKey') || CloudRunnerOptions.branch;
+  }
+
+  // ### ### ###
+  // Utility Parameters
+  // ### ### ###
+
+  static get cloudRunnerDebug(): boolean {
+    return (
+      CloudRunnerOptions.getInput(`cloudRunnerTests`) === `true` ||
+      CloudRunnerOptions.getInput(`cloudRunnerDebug`) === `true` ||
+      CloudRunnerOptions.getInput(`cloudRunnerDebugTree`) === `true` ||
+      CloudRunnerOptions.getInput(`cloudRunnerDebugEnv`) === `true` ||
+      false
+    );
+  }
+  static get skipLfs(): boolean {
+    return CloudRunnerOptions.getInput(`skipLfs`) === `true`;
+  }
+  static get skipCache(): boolean {
+    return CloudRunnerOptions.getInput(`skipCache`) === `true`;
+  }
+
+  public static get asyncCloudRunner(): boolean {
+    return CloudRunnerOptions.getInput('asyncCloudRunner') === 'true';
+  }
+
+  public static get useLargePackages(): boolean {
+    return CloudRunnerOptions.getInput(`useLargePackages`) === `true`;
+  }
+
+  public static get useSharedBuilder(): boolean {
+    return CloudRunnerOptions.getInput(`useSharedBuilder`) === `true`;
+  }
+
+  public static get useCompressionStrategy(): boolean {
+    return CloudRunnerOptions.getInput(`useCompressionStrategy`) === `true`;
+  }
+
+  public static get useCleanupCron(): boolean {
+    return (CloudRunnerOptions.getInput(`useCleanupCron`) || 'true') === 'true';
+  }
+
+  // ### ### ###
+  // Retained Workspace
+  // ### ### ###
+
+  public static get maxRetainedWorkspaces(): string {
+    return CloudRunnerOptions.getInput(`maxRetainedWorkspaces`) || `0`;
+  }
+
+  // ### ### ###
+  // Garbage Collection
+  // ### ### ###
+
+  static get garbageMaxAge(): number {
+    return Number(CloudRunnerOptions.getInput(`garbageMaxAge`)) || 24;
+  }
+}
+
+export default CloudRunnerOptions;

src/model/cloud-runner/options/cloud-runner-query-override.ts

@@ -0,0 +1,67 @@
+import Input from '../../input';
+import { GenericInputReader } from '../../input-readers/generic-input-reader';
+import CloudRunnerOptions from './cloud-runner-options';
+
+const formatFunction = (value: string, arguments_: any[]) => {
+  for (const element of arguments_) {
+    value = value.replace(`{${element.key}}`, element.value);
+  }
+
+  return value;
+};
+
+class CloudRunnerQueryOverride {
+  static queryOverrides: { [key: string]: string } | undefined;
+
+  // TODO accept premade secret sources or custom secret source definition yamls
+
+  public static query(key: string, alternativeKey: string) {
+    if (CloudRunnerQueryOverride.queryOverrides && CloudRunnerQueryOverride.queryOverrides[key] !== undefined) {
+      return CloudRunnerQueryOverride.queryOverrides[key];
+    }
+    if (
+      CloudRunnerQueryOverride.queryOverrides &&
+      alternativeKey &&
+      CloudRunnerQueryOverride.queryOverrides[alternativeKey] !== undefined
+    ) {
+      return CloudRunnerQueryOverride.queryOverrides[alternativeKey];
+    }
+
+    return;
+  }
+
+  private static shouldUseOverride(query: string) {
+    if (CloudRunnerOptions.inputPullCommand !== '') {
+      if (CloudRunnerOptions.pullInputList.length > 0) {
+        const doesInclude =
+          CloudRunnerOptions.pullInputList.includes(query) ||
+          CloudRunnerOptions.pullInputList.includes(Input.ToEnvVarFormat(query));
+
+        return doesInclude ? true : false;
+      } else {
+        return true;
+      }
+    }
+  }
+
+  private static async queryOverride(query: string) {
+    if (!this.shouldUseOverride(query)) {
+      throw new Error(`Should not be trying to run override query on ${query}`);
+    }
+
+    return await GenericInputReader.Run(
+      formatFunction(CloudRunnerOptions.inputPullCommand, [{ key: 0, value: query }]),
+    );
+  }
+
+  public static async PopulateQueryOverrideInput() {
+    const queries = CloudRunnerOptions.pullInputList;
+    CloudRunnerQueryOverride.queryOverrides = {};
+    for (const element of queries) {
+      if (CloudRunnerQueryOverride.shouldUseOverride(element)) {
+        CloudRunnerQueryOverride.queryOverrides[element] = await CloudRunnerQueryOverride.queryOverride(element);
+      }
+    }
+  }
+}
+export default CloudRunnerQueryOverride;

src/model/cloud-runner/options/cloud-runner-secret.ts

@@ -1,6 +1,6 @@
-class OrchestratorSecret {
+class CloudRunnerSecret {
   public ParameterKey!: string;
   public EnvironmentVariable!: string;
   public ParameterValue!: string;
 }
-export default OrchestratorSecret;
+export default CloudRunnerSecret;

src/model/cloud-runner/options/cloud-runner-statics.ts

@@ -0,0 +1,3 @@
+export class CloudRunnerStatics {
+  public static readonly logPrefix = `Cloud-Runner`;
+}

src/model/cloud-runner/options/cloud-runner-step-parameters.ts

@@ -0,0 +1,13 @@
+import CloudRunnerEnvironmentVariable from './cloud-runner-environment-variable';
+import CloudRunnerSecret from './cloud-runner-secret';
+
+export class CloudRunnerStepParameters {
+  public image: string;
+  public environment: CloudRunnerEnvironmentVariable[];
+  public secrets: CloudRunnerSecret[];
+  constructor(image: string, environmentVariables: CloudRunnerEnvironmentVariable[], secrets: CloudRunnerSecret[]) {
+    this.image = image;
+    this.environment = environmentVariables;
+    this.secrets = secrets;
+  }
+}

src/model/cloud-runner/providers/aws/aws-base-stack.ts

@@ -0,0 +1,105 @@
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
+import * as core from '@actions/core';
+import * as SDK from 'aws-sdk';
+import { BaseStackFormation } from './cloud-formations/base-stack-formation';
+import crypto from 'node:crypto';
+
+export class AWSBaseStack {
+  constructor(baseStackName: string) {
+    this.baseStackName = baseStackName;
+  }
+  private baseStackName: string;
+
+  async setupBaseStack(CF: SDK.CloudFormation) {
+    const baseStackName = this.baseStackName;
+
+    const baseStack = BaseStackFormation.formation;
+
+    // Cloud Formation Input
+    const describeStackInput: SDK.CloudFormation.DescribeStacksInput = {
+      StackName: baseStackName,
+    };
+    const parametersWithoutHash: SDK.CloudFormation.Parameter[] = [
+      { ParameterKey: 'EnvironmentName', ParameterValue: baseStackName },
+    ];
+    const parametersHash = crypto
+      .createHash('md5')
+      .update(baseStack + JSON.stringify(parametersWithoutHash))
+      .digest('hex');
+    const parameters: SDK.CloudFormation.Parameter[] = [
+      ...parametersWithoutHash,
+      ...[{ ParameterKey: 'Version', ParameterValue: parametersHash }],
+    ];
+    const updateInput: SDK.CloudFormation.UpdateStackInput = {
+      StackName: baseStackName,
+      TemplateBody: baseStack,
+      Parameters: parameters,
+      Capabilities: ['CAPABILITY_IAM'],
+    };
+    const createStackInput: SDK.CloudFormation.CreateStackInput = {
+      StackName: baseStackName,
+      TemplateBody: baseStack,
+      Parameters: parameters,
+      Capabilities: ['CAPABILITY_IAM'],
+    };
+
+    const stacks = await CF.listStacks({
+      StackStatusFilter: ['UPDATE_COMPLETE', 'CREATE_COMPLETE', 'ROLLBACK_COMPLETE'],
+    }).promise();
+    const stackNames = stacks.StackSummaries?.map((x) => x.StackName) || [];
+    const stackExists: Boolean = stackNames.includes(baseStackName) || false;
+    const describeStack = async () => {
+      return await CF.describeStacks(describeStackInput).promise();
+    };
+    try {
+      if (!stackExists) {
+        CloudRunnerLogger.log(`${baseStackName} stack does not exist (${JSON.stringify(stackNames)})`);
+        await CF.createStack(createStackInput).promise();
+        CloudRunnerLogger.log(`created stack (version: ${parametersHash})`);
+      }
+      const CFState = await describeStack();
+      let stack = CFState.Stacks?.[0];
+      if (!stack) {
+        throw new Error(`Base stack doesn't exist, even after creation, stackExists check: ${stackExists}`);
+      }
+      const stackVersion = stack.Parameters?.find((x) => x.ParameterKey === 'Version')?.ParameterValue;
+
+      if (stack.StackStatus === 'CREATE_IN_PROGRESS') {
+        await CF.waitFor('stackCreateComplete', describeStackInput).promise();
+      }
+
+      if (stackExists) {
+        CloudRunnerLogger.log(`Base stack exists (version: ${stackVersion}, local version: ${parametersHash})`);
+        if (parametersHash !== stackVersion) {
+          CloudRunnerLogger.log(`Attempting update of base stack`);
+          try {
+            await CF.updateStack(updateInput).promise();
+          } catch (error: any) {
+            if (error['message'].includes('No updates are to be performed')) {
+              CloudRunnerLogger.log(`No updates are to be performed`);
+            } else {
+              CloudRunnerLogger.log(`Update Failed (Stack name: ${baseStackName})`);
+              CloudRunnerLogger.log(error['message']);
+            }
+            CloudRunnerLogger.log(`Continuing...`);
+          }
+        } else {
+          CloudRunnerLogger.log(`No update required`);
+        }
+        stack = (await describeStack()).Stacks?.[0];
+        if (!stack) {
+          throw new Error(
+            `Base stack doesn't exist, even after updating and creation, stackExists check: ${stackExists}`,
+          );
+        }
+        if (stack.StackStatus === 'UPDATE_IN_PROGRESS') {
+          await CF.waitFor('stackUpdateComplete', describeStackInput).promise();
+        }
+      }
+      CloudRunnerLogger.log('base stack is now ready');
+    } catch (error) {
+      core.error(JSON.stringify(await describeStack(), undefined, 4));
+      throw error;
+    }
+  }
+}

src/model/cloud-runner/providers/aws/aws-cloud-formation-templates.ts

@@ -21,7 +21,6 @@ export class AWSCloudFormationTemplates {
 
   public static getSecretDefinitionTemplate(p1: string, p2: string) {
     return `
-          Secrets:
             - Name: '${p1}'
               ValueFrom: !Ref ${p2}Secret
 `;

src/model/cloud-runner/providers/aws/aws-error.ts

@@ -0,0 +1,16 @@
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
+import * as SDK from 'aws-sdk';
+import * as core from '@actions/core';
+import CloudRunner from '../../cloud-runner';
+
+export class AWSError {
+  static async handleStackCreationFailure(error: any, CF: SDK.CloudFormation, taskDefStackName: string) {
+    CloudRunnerLogger.log('aws error: ');
+    core.error(JSON.stringify(error, undefined, 4));
+    if (CloudRunner.buildParameters.cloudRunnerDebug) {
+      CloudRunnerLogger.log('Getting events and resources for task stack');
+      const events = (await CF.describeStackEvents({ StackName: taskDefStackName }).promise()).StackEvents;
+      CloudRunnerLogger.log(JSON.stringify(events, undefined, 4));
+    }
+  }
+}

src/model/cloud-runner/providers/aws/aws-job-stack.ts

@@ -1,34 +1,14 @@
-import {
+import * as SDK from 'aws-sdk';
-  CloudFormation,
+import CloudRunnerAWSTaskDef from './cloud-runner-aws-task-def';
-  CreateStackCommand,
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
-  // eslint-disable-next-line import/named
-  CreateStackCommandInput,
-  DescribeStackResourcesCommand,
-  DescribeStacksCommand,
-  ListStacksCommand,
-  waitUntilStackCreateComplete,
-} from '@aws-sdk/client-cloudformation';
-import OrchestratorAWSTaskDef from './orchestrator-aws-task-def';
-import OrchestratorSecret from '../../options/orchestrator-secret';
 import { AWSCloudFormationTemplates } from './aws-cloud-formation-templates';
-import OrchestratorLogger from '../../services/core/orchestrator-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { AWSError } from './aws-error';
-import Orchestrator from '../../orchestrator';
+import CloudRunner from '../../cloud-runner';
 import { CleanupCronFormation } from './cloud-formations/cleanup-cron-formation';
-import OrchestratorOptions from '../../options/orchestrator-options';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
 import { TaskDefinitionFormation } from './cloud-formations/task-definition-formation';
 
-const DEFAULT_STACK_WAIT_TIME_SECONDS = 600;
-
-function getStackWaitTime(): number {
-  const overrideValue = Number(process.env.ORCHESTRATOR_AWS_STACK_WAIT_TIME ?? '');
-  if (!Number.isNaN(overrideValue) && overrideValue > 0) {
-    return overrideValue;
-  }
-
-  return DEFAULT_STACK_WAIT_TIME_SECONDS;
-}
-
 export class AWSJobStack {
   private baseStackName: string;
   constructor(baseStackName: string) {
@@ -36,30 +16,30 @@ export class AWSJobStack {
   }
 
   public async setupCloudFormations(
-    CF: CloudFormation,
+    CF: SDK.CloudFormation,
     buildGuid: string,
     image: string,
     entrypoint: string[],
     commands: string,
     mountdir: string,
     workingdir: string,
-    secrets: OrchestratorSecret[],
+    secrets: CloudRunnerSecret[],
-  ): Promise<OrchestratorAWSTaskDef> {
+  ): Promise<CloudRunnerAWSTaskDef> {
     const taskDefStackName = `${this.baseStackName}-${buildGuid}`;
     let taskDefCloudFormation = AWSCloudFormationTemplates.readTaskCloudFormationTemplate();
     taskDefCloudFormation = taskDefCloudFormation.replace(
       `ContainerCpu:
     Default: 1024`,
       `ContainerCpu:
-    Default: ${Number.parseInt(Orchestrator.buildParameters.containerCpu)}`,
+    Default: ${Number.parseInt(CloudRunner.buildParameters.containerCpu)}`,
     );
     taskDefCloudFormation = taskDefCloudFormation.replace(
       `ContainerMemory:
     Default: 2048`,
       `ContainerMemory:
-    Default: ${Number.parseInt(Orchestrator.buildParameters.containerMemory)}`,
+    Default: ${Number.parseInt(CloudRunner.buildParameters.containerMemory)}`,
     );
-    if (!OrchestratorOptions.asyncOrchestrator) {
+    if (!CloudRunnerOptions.asyncCloudRunner) {
       taskDefCloudFormation = AWSCloudFormationTemplates.insertAtTemplate(
         taskDefCloudFormation,
         '# template resources logstream',
@@ -133,13 +113,13 @@ export class AWSJobStack {
       },
       ...secretsMappedToCloudFormationParameters,
     ];
-    OrchestratorLogger.log(
+    CloudRunnerLogger.log(
-      `Starting AWS job with memory: ${Orchestrator.buildParameters.containerMemory} cpu: ${Orchestrator.buildParameters.containerCpu}`,
+      `Starting AWS job with memory: ${CloudRunner.buildParameters.containerMemory} cpu: ${CloudRunner.buildParameters.containerCpu}`,
     );
     let previousStackExists = true;
     while (previousStackExists) {
       previousStackExists = false;
-      const stacks = await CF.send(new ListStacksCommand({}));
+      const stacks = await CF.listStacks().promise();
       if (!stacks.StackSummaries) {
         throw new Error('Faild to get stacks');
       }
@@ -147,31 +127,22 @@ export class AWSJobStack {
         const element = stacks.StackSummaries[index];
         if (element.StackName === taskDefStackName && element.StackStatus !== 'DELETE_COMPLETE') {
           previousStackExists = true;
-          OrchestratorLogger.log(`Previous stack still exists: ${JSON.stringify(element)}`);
+          CloudRunnerLogger.log(`Previous stack still exists: ${JSON.stringify(element)}`);
           await new Promise((promise) => setTimeout(promise, 5000));
         }
       }
     }
-    const createStackInput: CreateStackCommandInput = {
+    const createStackInput: SDK.CloudFormation.CreateStackInput = {
       StackName: taskDefStackName,
       TemplateBody: taskDefCloudFormation,
       Capabilities: ['CAPABILITY_IAM'],
       Parameters: parameters,
     };
     try {
-      const stackWaitTimeSeconds = getStackWaitTime();
+      CloudRunnerLogger.log(`Creating job aws formation ${taskDefStackName}`);
-      OrchestratorLogger.log(
+      await CF.createStack(createStackInput).promise();
-        `Creating job aws formation ${taskDefStackName} (waiting up to ${stackWaitTimeSeconds}s for completion)`,
+      await CF.waitFor('stackCreateComplete', { StackName: taskDefStackName }).promise();
-      );
+      const describeStack = await CF.describeStacks({ StackName: taskDefStackName }).promise();
-      await CF.send(new CreateStackCommand(createStackInput));
-      await waitUntilStackCreateComplete(
-        {
-          client: CF,
-          maxWaitTime: stackWaitTimeSeconds,
-        },
-        { StackName: taskDefStackName },
-      );
-      const describeStack = await CF.send(new DescribeStacksCommand({ StackName: taskDefStackName }));
       for (const parameter of parameters) {
         if (!describeStack.Stacks?.[0].Parameters?.some((x) => x.ParameterKey === parameter.ParameterKey)) {
           throw new Error(`Parameter ${parameter.ParameterKey} not found in stack`);
@@ -182,7 +153,7 @@ export class AWSJobStack {
       throw error;
     }
 
-    const createCleanupStackInput: CreateStackCommandInput = {
+    const createCleanupStackInput: SDK.CloudFormation.CreateStackInput = {
       StackName: `${taskDefStackName}-cleanup`,
       TemplateBody: CleanupCronFormation.formation,
       Capabilities: ['CAPABILITY_IAM'],
@@ -201,7 +172,7 @@ export class AWSJobStack {
         },
         {
           ParameterKey: 'BUILDGUID',
-          ParameterValue: Orchestrator.buildParameters.buildGuid,
+          ParameterValue: CloudRunner.buildParameters.buildGuid,
         },
         {
           ParameterKey: 'EnvironmentName',
@@ -209,10 +180,10 @@ export class AWSJobStack {
         },
       ],
     };
-    if (OrchestratorOptions.useCleanupCron) {
+    if (CloudRunnerOptions.useCleanupCron) {
       try {
-        OrchestratorLogger.log(`Creating job cleanup formation`);
+        CloudRunnerLogger.log(`Creating job cleanup formation`);
-        await CF.send(new CreateStackCommand(createCleanupStackInput));
+        await CF.createStack(createCleanupStackInput).promise();
 
         // await CF.waitFor('stackCreateComplete', { StackName: createCleanupStackInput.StackName }).promise();
       } catch (error) {
@@ -222,15 +193,12 @@ export class AWSJobStack {
     }
 
     const taskDefResources = (
-      await CF.send(
+      await CF.describeStackResources({
-        new DescribeStackResourcesCommand({
+        StackName: taskDefStackName,
-          StackName: taskDefStackName,
+      }).promise()
-        }),
-      )
     ).StackResources;
 
-    const baseResources = (await CF.send(new DescribeStackResourcesCommand({ StackName: this.baseStackName })))
+    const baseResources = (await CF.describeStackResources({ StackName: this.baseStackName }).promise()).StackResources;
-      .StackResources;
 
     return {
       taskDefStackName,

src/model/cloud-runner/providers/aws/aws-task-runner.ts

@@ -0,0 +1,250 @@
+import * as AWS from 'aws-sdk';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
+import * as core from '@actions/core';
+import CloudRunnerAWSTaskDef from './cloud-runner-aws-task-def';
+import * as zlib from 'node:zlib';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
+import { Input } from '../../..';
+import CloudRunner from '../../cloud-runner';
+import { CommandHookService } from '../../services/hooks/command-hook-service';
+import { FollowLogStreamService } from '../../services/core/follow-log-stream-service';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
+import GitHub from '../../../github';
+
+class AWSTaskRunner {
+  public static ECS: AWS.ECS;
+  public static Kinesis: AWS.Kinesis;
+  private static readonly encodedUnderscore = `$252F`;
+  static async runTask(
+    taskDef: CloudRunnerAWSTaskDef,
+    environment: CloudRunnerEnvironmentVariable[],
+    commands: string,
+  ): Promise<{ output: string; shouldCleanup: boolean }> {
+    const cluster = taskDef.baseResources?.find((x) => x.LogicalResourceId === 'ECSCluster')?.PhysicalResourceId || '';
+    const taskDefinition =
+      taskDef.taskDefResources?.find((x) => x.LogicalResourceId === 'TaskDefinition')?.PhysicalResourceId || '';
+    const SubnetOne =
+      taskDef.baseResources?.find((x) => x.LogicalResourceId === 'PublicSubnetOne')?.PhysicalResourceId || '';
+    const SubnetTwo =
+      taskDef.baseResources?.find((x) => x.LogicalResourceId === 'PublicSubnetTwo')?.PhysicalResourceId || '';
+    const ContainerSecurityGroup =
+      taskDef.baseResources?.find((x) => x.LogicalResourceId === 'ContainerSecurityGroup')?.PhysicalResourceId || '';
+    const streamName =
+      taskDef.taskDefResources?.find((x) => x.LogicalResourceId === 'KinesisStream')?.PhysicalResourceId || '';
+
+    const runParameters = {
+      cluster,
+      taskDefinition,
+      platformVersion: '1.4.0',
+      overrides: {
+        containerOverrides: [
+          {
+            name: taskDef.taskDefStackName,
+            environment,
+            command: ['-c', CommandHookService.ApplyHooksToCommands(commands, CloudRunner.buildParameters)],
+          },
+        ],
+      },
+      launchType: 'FARGATE',
+      networkConfiguration: {
+        awsvpcConfiguration: {
+          subnets: [SubnetOne, SubnetTwo],
+          assignPublicIp: 'ENABLED',
+          securityGroups: [ContainerSecurityGroup],
+        },
+      },
+    };
+
+    if (JSON.stringify(runParameters.overrides.containerOverrides).length > 8192) {
+      CloudRunnerLogger.log(JSON.stringify(runParameters.overrides.containerOverrides, undefined, 4));
+      throw new Error(`Container Overrides length must be at most 8192`);
+    }
+
+    const task = await AWSTaskRunner.ECS.runTask(runParameters).promise();
+    const taskArn = task.tasks?.[0].taskArn || '';
+    CloudRunnerLogger.log('Cloud runner job is starting');
+    await AWSTaskRunner.waitUntilTaskRunning(taskArn, cluster);
+    CloudRunnerLogger.log(
+      `Cloud runner job status is running ${(await AWSTaskRunner.describeTasks(cluster, taskArn))?.lastStatus} Async:${
+        CloudRunnerOptions.asyncCloudRunner
+      }`,
+    );
+    if (CloudRunnerOptions.asyncCloudRunner) {
+      const shouldCleanup: boolean = false;
+      const output: string = '';
+      CloudRunnerLogger.log(`Watch Cloud Runner To End: false`);
+
+      return { output, shouldCleanup };
+    }
+
+    CloudRunnerLogger.log(`Streaming...`);
+    const { output, shouldCleanup } = await this.streamLogsUntilTaskStops(cluster, taskArn, streamName);
+    let exitCode;
+    let containerState;
+    let taskData;
+    while (exitCode === undefined) {
+      await new Promise((resolve) => resolve(10000));
+      taskData = await AWSTaskRunner.describeTasks(cluster, taskArn);
+      containerState = taskData.containers?.[0];
+      exitCode = containerState?.exitCode;
+    }
+    CloudRunnerLogger.log(`Container State: ${JSON.stringify(containerState, undefined, 4)}`);
+    if (exitCode === undefined) {
+      CloudRunnerLogger.logWarning(`Undefined exitcode for container`);
+    }
+    const wasSuccessful = exitCode === 0;
+    if (wasSuccessful) {
+      CloudRunnerLogger.log(`Cloud runner job has finished successfully`);
+
+      return { output, shouldCleanup };
+    }
+
+    if (taskData?.stoppedReason === 'Essential container in task exited' && exitCode === 1) {
+      throw new Error('Container exited with code 1');
+    }
+
+    throw new Error(`Task failed`);
+  }
+
+  private static async waitUntilTaskRunning(taskArn: string, cluster: string) {
+    try {
+      await AWSTaskRunner.ECS.waitFor('tasksRunning', { tasks: [taskArn], cluster }).promise();
+    } catch (error_) {
+      const error = error_ as Error;
+      await new Promise((resolve) => setTimeout(resolve, 3000));
+      CloudRunnerLogger.log(
+        `Cloud runner job has ended ${
+          (await AWSTaskRunner.describeTasks(cluster, taskArn)).containers?.[0].lastStatus
+        }`,
+      );
+
+      core.setFailed(error);
+      core.error(error);
+    }
+  }
+
+  static async describeTasks(clusterName: string, taskArn: string) {
+    const tasks = await AWSTaskRunner.ECS.describeTasks({
+      cluster: clusterName,
+      tasks: [taskArn],
+    }).promise();
+    if (tasks.tasks?.[0]) {
+      return tasks.tasks?.[0];
+    } else {
+      throw new Error('No task found');
+    }
+  }
+
+  static async streamLogsUntilTaskStops(clusterName: string, taskArn: string, kinesisStreamName: string) {
+    await new Promise((resolve) => setTimeout(resolve, 3000));
+    CloudRunnerLogger.log(`Streaming...`);
+    const stream = await AWSTaskRunner.getLogStream(kinesisStreamName);
+    let iterator = await AWSTaskRunner.getLogIterator(stream);
+
+    const logBaseUrl = `https://${Input.region}.console.aws.amazon.com/cloudwatch/home?region=${Input.region}#logsV2:log-groups/log-group/${CloudRunner.buildParameters.awsStackName}${AWSTaskRunner.encodedUnderscore}${CloudRunner.buildParameters.awsStackName}-${CloudRunner.buildParameters.buildGuid}`;
+    CloudRunnerLogger.log(`You view the log stream on AWS Cloud Watch: ${logBaseUrl}`);
+    await GitHub.updateGitHubCheck(`You view the log stream on AWS Cloud Watch:  ${logBaseUrl}`, ``);
+    let shouldReadLogs = true;
+    let shouldCleanup = true;
+    let timestamp: number = 0;
+    let output = '';
+    while (shouldReadLogs) {
+      await new Promise((resolve) => setTimeout(resolve, 1500));
+      const taskData = await AWSTaskRunner.describeTasks(clusterName, taskArn);
+      ({ timestamp, shouldReadLogs } = AWSTaskRunner.checkStreamingShouldContinue(taskData, timestamp, shouldReadLogs));
+      ({ iterator, shouldReadLogs, output, shouldCleanup } = await AWSTaskRunner.handleLogStreamIteration(
+        iterator,
+        shouldReadLogs,
+        output,
+        shouldCleanup,
+      ));
+    }
+
+    return { output, shouldCleanup };
+  }
+
+  private static async handleLogStreamIteration(
+    iterator: string,
+    shouldReadLogs: boolean,
+    output: string,
+    shouldCleanup: boolean,
+  ) {
+    const records = await AWSTaskRunner.Kinesis.getRecords({
+      ShardIterator: iterator,
+    }).promise();
+    iterator = records.NextShardIterator || '';
+    ({ shouldReadLogs, output, shouldCleanup } = AWSTaskRunner.logRecords(
+      records,
+      iterator,
+      shouldReadLogs,
+      output,
+      shouldCleanup,
+    ));
+
+    return { iterator, shouldReadLogs, output, shouldCleanup };
+  }
+
+  private static checkStreamingShouldContinue(taskData: AWS.ECS.Task, timestamp: number, shouldReadLogs: boolean) {
+    if (taskData?.lastStatus === 'UNKNOWN') {
+      CloudRunnerLogger.log('## Cloud runner job unknwon');
+    }
+    if (taskData?.lastStatus !== 'RUNNING') {
+      if (timestamp === 0) {
+        CloudRunnerLogger.log('## Cloud runner job stopped, streaming end of logs');
+        timestamp = Date.now();
+      }
+      if (timestamp !== 0 && Date.now() - timestamp > 30000) {
+        CloudRunnerLogger.log('## Cloud runner status is not RUNNING for 30 seconds, last query for logs');
+        shouldReadLogs = false;
+      }
+      CloudRunnerLogger.log(`## Status of job: ${taskData.lastStatus}`);
+    }
+
+    return { timestamp, shouldReadLogs };
+  }
+
+  private static logRecords(
+    records: AWS.Kinesis.GetRecordsOutput,
+    iterator: string,
+    shouldReadLogs: boolean,
+    output: string,
+    shouldCleanup: boolean,
+  ) {
+    if (records.Records.length > 0 && iterator) {
+      for (const record of records.Records) {
+        const json = JSON.parse(zlib.gunzipSync(Buffer.from(record.Data as string, 'base64')).toString('utf8'));
+        if (json.messageType === 'DATA_MESSAGE') {
+          for (const logEvent of json.logEvents) {
+            ({ shouldReadLogs, shouldCleanup, output } = FollowLogStreamService.handleIteration(
+              logEvent.message,
+              shouldReadLogs,
+              shouldCleanup,
+              output,
+            ));
+          }
+        }
+      }
+    }
+
+    return { shouldReadLogs, output, shouldCleanup };
+  }
+
+  private static async getLogStream(kinesisStreamName: string) {
+    return await AWSTaskRunner.Kinesis.describeStream({
+      StreamName: kinesisStreamName,
+    }).promise();
+  }
+
+  private static async getLogIterator(stream: AWS.Kinesis.DescribeStreamOutput) {
+    return (
+      (
+        await AWSTaskRunner.Kinesis.getShardIterator({
+          ShardIteratorType: 'TRIM_HORIZON',
+          StreamName: stream.StreamDescription.StreamName,
+          ShardId: stream.StreamDescription.Shards[0].ShardId,
+        }).promise()
+      ).ShardIterator || ''
+    );
+  }
+}
+export default AWSTaskRunner;

src/model/cloud-runner/providers/aws/cloud-formations/task-definition-formation.ts

@@ -1,7 +1,7 @@
-import Orchestrator from '../../../orchestrator';
+import CloudRunner from '../../../cloud-runner';
 
 export class TaskDefinitionFormation {
-  public static readonly description: string = `Game CI Orchestrator Task Stack`;
+  public static readonly description: string = `Game CI Cloud Runner Task Stack`;
   public static get formation(): string {
     return `AWSTemplateFormatVersion: 2010-09-09
 Description: ${TaskDefinitionFormation.description}
@@ -29,11 +29,11 @@ Parameters:
     Default: 80
     Description: What port number the application inside the docker container is binding to
   ContainerCpu:
-    Default: ${Orchestrator.buildParameters.containerCpu}
+    Default: ${CloudRunner.buildParameters.containerCpu}
     Type: Number
     Description: How much CPU to give the container. 1024 is 1 CPU
   ContainerMemory:
-    Default: ${Orchestrator.buildParameters.containerMemory}
+    Default: ${CloudRunner.buildParameters.containerMemory}
     Type: Number
     Description: How much memory in megabytes to give the container
   BUILDGUID:
@@ -127,7 +127,8 @@ Resources:
             - SourceVolume: efs-data
               ContainerPath: !Ref EFSMountDirectory
               ReadOnly: false
-          # template secrets p3 - container def
+          Secrets:
+            # template secrets p3 - container def
           LogConfiguration:
             LogDriver: awslogs
             Options:

src/model/cloud-runner/providers/aws/cloud-runner-aws-task-def.ts

@@ -0,0 +1,9 @@
+import * as AWS from 'aws-sdk';
+
+class CloudRunnerAWSTaskDef {
+  public taskDefStackName!: string;
+  public taskDefCloudFormation!: string;
+  public taskDefResources: AWS.CloudFormation.StackResources | undefined;
+  public baseResources: AWS.CloudFormation.StackResources | undefined;
+}
+export default CloudRunnerAWSTaskDef;

src/model/cloud-runner/providers/aws/index.ts

@@ -1,11 +1,11 @@
-import { CloudFormation, DeleteStackCommand, waitUntilStackDeleteComplete } from '@aws-sdk/client-cloudformation';
+import * as SDK from 'aws-sdk';
-import OrchestratorSecret from '../../options/orchestrator-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
-import OrchestratorEnvironmentVariable from '../../options/orchestrator-environment-variable';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
-import OrchestratorAWSTaskDef from './orchestrator-aws-task-def';
+import CloudRunnerAWSTaskDef from './cloud-runner-aws-task-def';
 import AwsTaskRunner from './aws-task-runner';
 import { ProviderInterface } from '../provider-interface';
 import BuildParameters from '../../../build-parameters';
-import OrchestratorLogger from '../../services/core/orchestrator-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { AWSJobStack as AwsJobStack } from './aws-job-stack';
 import { AWSBaseStack as AwsBaseStack } from './aws-base-stack';
 import { Input } from '../../..';
@@ -13,20 +13,7 @@ import { GarbageCollectionService } from './services/garbage-collection-service'
 import { ProviderResource } from '../provider-resource';
 import { ProviderWorkflow } from '../provider-workflow';
 import { TaskService } from './services/task-service';
-import OrchestratorOptions from '../../options/orchestrator-options';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
-import { AwsClientFactory } from './aws-client-factory';
-import ResourceTracking from '../../services/core/resource-tracking';
-
-const DEFAULT_STACK_WAIT_TIME_SECONDS = 600;
-
-function getStackWaitTime(): number {
-  const overrideValue = Number(process.env.ORCHESTRATOR_AWS_STACK_WAIT_TIME ?? '');
-  if (!Number.isNaN(overrideValue) && overrideValue > 0) {
-    return overrideValue;
-  }
-
-  return DEFAULT_STACK_WAIT_TIME_SECONDS;
-}
 
 class AWSBuildEnvironment implements ProviderInterface {
   private baseStackName: string;
@@ -88,7 +75,7 @@ class AWSBuildEnvironment implements ProviderInterface {
     defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[],
   ) {
     process.env.AWS_REGION = Input.region;
-    const CF = AwsClientFactory.getCloudFormation();
+    const CF = new SDK.CloudFormation();
     await new AwsBaseStack(this.baseStackName).setupBaseStack(CF);
   }
 
@@ -98,16 +85,15 @@ class AWSBuildEnvironment implements ProviderInterface {
     commands: string,
     mountdir: string,
     workingdir: string,
-    environment: OrchestratorEnvironmentVariable[],
+    environment: CloudRunnerEnvironmentVariable[],
-    secrets: OrchestratorSecret[],
+    secrets: CloudRunnerSecret[],
   ): Promise<string> {
     process.env.AWS_REGION = Input.region;
-    ResourceTracking.logAllocationSummary('aws workflow');
+    const ECS = new SDK.ECS();
-    await ResourceTracking.logDiskUsageSnapshot('aws workflow (host)');
+    const CF = new SDK.CloudFormation();
-    AwsClientFactory.getECS();
+    AwsTaskRunner.ECS = ECS;
-    const CF = AwsClientFactory.getCloudFormation();
+    AwsTaskRunner.Kinesis = new SDK.Kinesis();
-    AwsClientFactory.getKinesis();
+    CloudRunnerLogger.log(`AWS Region: ${CF.config.region}`);
-    OrchestratorLogger.log(`AWS Region: ${CF.config.region}`);
     const entrypoint = ['/bin/sh'];
     const startTimeMs = Date.now();
     const taskDef = await new AwsJobStack(this.baseStackName).setupCloudFormations(
@@ -124,53 +110,44 @@ class AWSBuildEnvironment implements ProviderInterface {
     let postRunTaskTimeMs;
     try {
       const postSetupStacksTimeMs = Date.now();
-      OrchestratorLogger.log(`Setup job time: ${Math.floor((postSetupStacksTimeMs - startTimeMs) / 1000)}s`);
+      CloudRunnerLogger.log(`Setup job time: ${Math.floor((postSetupStacksTimeMs - startTimeMs) / 1000)}s`);
       const { output, shouldCleanup } = await AwsTaskRunner.runTask(taskDef, environment, commands);
       postRunTaskTimeMs = Date.now();
-      OrchestratorLogger.log(`Run job time: ${Math.floor((postRunTaskTimeMs - postSetupStacksTimeMs) / 1000)}s`);
+      CloudRunnerLogger.log(`Run job time: ${Math.floor((postRunTaskTimeMs - postSetupStacksTimeMs) / 1000)}s`);
       if (shouldCleanup) {
         await this.cleanupResources(CF, taskDef);
       }
       const postCleanupTimeMs = Date.now();
       if (postRunTaskTimeMs !== undefined)
-        OrchestratorLogger.log(`Cleanup job time: ${Math.floor((postCleanupTimeMs - postRunTaskTimeMs) / 1000)}s`);
+        CloudRunnerLogger.log(`Cleanup job time: ${Math.floor((postCleanupTimeMs - postRunTaskTimeMs) / 1000)}s`);
 
       return output;
     } catch (error) {
-      OrchestratorLogger.log(`error running task ${error}`);
+      CloudRunnerLogger.log(`error running task ${error}`);
       await this.cleanupResources(CF, taskDef);
       throw error;
     }
   }
 
-  async cleanupResources(CF: CloudFormation, taskDef: OrchestratorAWSTaskDef) {
+  async cleanupResources(CF: SDK.CloudFormation, taskDef: CloudRunnerAWSTaskDef) {
-    const stackWaitTimeSeconds = getStackWaitTime();
+    CloudRunnerLogger.log('Cleanup starting');
-    OrchestratorLogger.log(`Cleanup starting (waiting up to ${stackWaitTimeSeconds}s for stack deletion)`);
+    await CF.deleteStack({
-    await CF.send(new DeleteStackCommand({ StackName: taskDef.taskDefStackName }));
+      StackName: taskDef.taskDefStackName,
-    if (OrchestratorOptions.useCleanupCron) {
+    }).promise();
-      await CF.send(new DeleteStackCommand({ StackName: `${taskDef.taskDefStackName}-cleanup` }));
+    if (CloudRunnerOptions.useCleanupCron) {
+      await CF.deleteStack({
+        StackName: `${taskDef.taskDefStackName}-cleanup`,
+      }).promise();
     }
 
-    await waitUntilStackDeleteComplete(
+    await CF.waitFor('stackDeleteComplete', {
-      {
+      StackName: taskDef.taskDefStackName,
-        client: CF,
+    }).promise();
-        maxWaitTime: stackWaitTimeSeconds,
+    await CF.waitFor('stackDeleteComplete', {
-      },
+      StackName: `${taskDef.taskDefStackName}-cleanup`,
-      {
+    }).promise();
-        StackName: taskDef.taskDefStackName,
+    CloudRunnerLogger.log(`Deleted Stack: ${taskDef.taskDefStackName}`);
-      },
+    CloudRunnerLogger.log('Cleanup complete');
-    );
-    await waitUntilStackDeleteComplete(
-      {
-        client: CF,
-        maxWaitTime: stackWaitTimeSeconds,
-      },
-      {
-        StackName: `${taskDef.taskDefStackName}-cleanup`,
-      },
-    );
-    OrchestratorLogger.log(`Deleted Stack: ${taskDef.taskDefStackName}`);
-    OrchestratorLogger.log('Cleanup complete');
   }
 }
 export default AWSBuildEnvironment;

src/model/cloud-runner/providers/aws/services/garbage-collection-service.ts

@@ -1,10 +1,7 @@
-import { DeleteStackCommand, DescribeStackResourcesCommand } from '@aws-sdk/client-cloudformation';
+import AWS from 'aws-sdk';
-import { DeleteLogGroupCommand } from '@aws-sdk/client-cloudwatch-logs';
-import { StopTaskCommand } from '@aws-sdk/client-ecs';
 import Input from '../../../../input';
-import OrchestratorLogger from '../../../services/core/orchestrator-logger';
+import CloudRunnerLogger from '../../../services/core/cloud-runner-logger';
 import { TaskService } from './task-service';
-import { AwsClientFactory } from '../aws-client-factory';
 
 export class GarbageCollectionService {
   static isOlderThan1day(date: Date) {
@@ -15,9 +12,9 @@ export class GarbageCollectionService {
 
   public static async cleanup(deleteResources = false, OneDayOlderOnly: boolean = false) {
     process.env.AWS_REGION = Input.region;
-    const CF = AwsClientFactory.getCloudFormation();
+    const CF = new AWS.CloudFormation();
-    const ecs = AwsClientFactory.getECS();
+    const ecs = new AWS.ECS();
-    const cwl = AwsClientFactory.getCloudWatchLogs();
+    const cwl = new AWS.CloudWatchLogs();
     const taskDefinitionsInUse = new Array();
     const tasks = await TaskService.getTasks();
 
@@ -25,35 +22,33 @@ export class GarbageCollectionService {
       const { taskElement, element } = task;
       taskDefinitionsInUse.push(taskElement.taskDefinitionArn);
       if (deleteResources && (!OneDayOlderOnly || GarbageCollectionService.isOlderThan1day(taskElement.createdAt!))) {
-        OrchestratorLogger.log(`Stopping task ${taskElement.containers?.[0].name}`);
+        CloudRunnerLogger.log(`Stopping task ${taskElement.containers?.[0].name}`);
-        await ecs.send(new StopTaskCommand({ task: taskElement.taskArn || '', cluster: element }));
+        await ecs.stopTask({ task: taskElement.taskArn || '', cluster: element }).promise();
       }
     }
 
     const jobStacks = await TaskService.getCloudFormationJobStacks();
     for (const element of jobStacks) {
       if (
-        (await CF.send(new DescribeStackResourcesCommand({ StackName: element.StackName }))).StackResources?.some(
+        (await CF.describeStackResources({ StackName: element.StackName }).promise()).StackResources?.some(
           (x) => x.ResourceType === 'AWS::ECS::TaskDefinition' && taskDefinitionsInUse.includes(x.PhysicalResourceId),
         )
       ) {
-        OrchestratorLogger.log(`Skipping ${element.StackName} - active task was running not deleting`);
+        CloudRunnerLogger.log(`Skipping ${element.StackName} - active task was running not deleting`);
 
         return;
       }
 
-      if (
+      if (deleteResources && (!OneDayOlderOnly || GarbageCollectionService.isOlderThan1day(element.CreationTime))) {
-        deleteResources &&
-        (!OneDayOlderOnly || (element.CreationTime && GarbageCollectionService.isOlderThan1day(element.CreationTime)))
-      ) {
         if (element.StackName === 'game-ci' || element.TemplateDescription === 'Game-CI base stack') {
-          OrchestratorLogger.log(`Skipping ${element.StackName} ignore list`);
+          CloudRunnerLogger.log(`Skipping ${element.StackName} ignore list`);
 
           return;
         }
 
-        OrchestratorLogger.log(`Deleting ${element.StackName}`);
+        CloudRunnerLogger.log(`Deleting ${element.StackName}`);
-        await CF.send(new DeleteStackCommand({ StackName: element.StackName }));
+        const deleteStackInput: AWS.CloudFormation.DeleteStackInput = { StackName: element.StackName };
+        await CF.deleteStack(deleteStackInput).promise();
       }
     }
     const logGroups = await TaskService.getLogGroups();
@@ -62,14 +57,14 @@ export class GarbageCollectionService {
         deleteResources &&
         (!OneDayOlderOnly || GarbageCollectionService.isOlderThan1day(new Date(element.creationTime!)))
       ) {
-        OrchestratorLogger.log(`Deleting ${element.logGroupName}`);
+        CloudRunnerLogger.log(`Deleting ${element.logGroupName}`);
-        await cwl.send(new DeleteLogGroupCommand({ logGroupName: element.logGroupName || '' }));
+        await cwl.deleteLogGroup({ logGroupName: element.logGroupName || '' }).promise();
       }
     }
 
     const locks = await TaskService.getLocks();
     for (const element of locks) {
-      OrchestratorLogger.log(`Lock: ${element.Key}`);
+      CloudRunnerLogger.log(`Lock: ${element.Key}`);
     }
   }
 }

src/model/cloud-runner/providers/aws/services/task-service.ts

@@ -0,0 +1,170 @@
+import AWS from 'aws-sdk';
+import Input from '../../../../input';
+import CloudRunnerLogger from '../../../services/core/cloud-runner-logger';
+import { BaseStackFormation } from '../cloud-formations/base-stack-formation';
+import AwsTaskRunner from '../aws-task-runner';
+import { ListObjectsRequest } from 'aws-sdk/clients/s3';
+import CloudRunner from '../../../cloud-runner';
+import { StackSummaries } from 'aws-sdk/clients/cloudformation';
+import { LogGroups } from 'aws-sdk/clients/cloudwatchlogs';
+
+export class TaskService {
+  static async watch() {
+    // eslint-disable-next-line no-unused-vars
+    const { output, shouldCleanup } = await AwsTaskRunner.streamLogsUntilTaskStops(
+      process.env.cluster || ``,
+      process.env.taskArn || ``,
+      process.env.streamName || ``,
+    );
+
+    return output;
+  }
+  public static async getCloudFormationJobStacks() {
+    const result: StackSummaries = [];
+    CloudRunnerLogger.log(``);
+    CloudRunnerLogger.log(`List Cloud Formation Stacks`);
+    process.env.AWS_REGION = Input.region;
+    const CF = new AWS.CloudFormation();
+    const stacks =
+      (await CF.listStacks().promise()).StackSummaries?.filter(
+        (_x) =>
+          _x.StackStatus !== 'DELETE_COMPLETE' && _x.TemplateDescription !== BaseStackFormation.baseStackDecription,
+      ) || [];
+    CloudRunnerLogger.log(``);
+    CloudRunnerLogger.log(`Cloud Formation Stacks ${stacks.length}`);
+    for (const element of stacks) {
+      const ageDate: Date = new Date(Date.now() - element.CreationTime.getTime());
+
+      CloudRunnerLogger.log(
+        `Task Stack ${element.StackName} - Age D${Math.floor(
+          ageDate.getHours() / 24,
+        )} H${ageDate.getHours()} M${ageDate.getMinutes()}`,
+      );
+      result.push(element);
+    }
+    const baseStacks =
+      (await CF.listStacks().promise()).StackSummaries?.filter(
+        (_x) =>
+          _x.StackStatus !== 'DELETE_COMPLETE' && _x.TemplateDescription === BaseStackFormation.baseStackDecription,
+      ) || [];
+    CloudRunnerLogger.log(``);
+    CloudRunnerLogger.log(`Base Stacks ${baseStacks.length}`);
+    for (const element of baseStacks) {
+      const ageDate: Date = new Date(Date.now() - element.CreationTime.getTime());
+
+      CloudRunnerLogger.log(
+        `Task Stack ${element.StackName} - Age D${Math.floor(
+          ageDate.getHours() / 24,
+        )} H${ageDate.getHours()} M${ageDate.getMinutes()}`,
+      );
+      result.push(element);
+    }
+    CloudRunnerLogger.log(``);
+
+    return result;
+  }
+  public static async getTasks() {
+    const result: { taskElement: AWS.ECS.Task; element: string }[] = [];
+    CloudRunnerLogger.log(``);
+    CloudRunnerLogger.log(`List Tasks`);
+    process.env.AWS_REGION = Input.region;
+    const ecs = new AWS.ECS();
+    const clusters = (await ecs.listClusters().promise()).clusterArns || [];
+    CloudRunnerLogger.log(`Task Clusters ${clusters.length}`);
+    for (const element of clusters) {
+      const input: AWS.ECS.ListTasksRequest = {
+        cluster: element,
+      };
+
+      const list = (await ecs.listTasks(input).promise()).taskArns || [];
+      if (list.length > 0) {
+        const describeInput: AWS.ECS.DescribeTasksRequest = { tasks: list, cluster: element };
+        const describeList = (await ecs.describeTasks(describeInput).promise()).tasks || [];
+        if (describeList.length === 0) {
+          CloudRunnerLogger.log(`No Tasks`);
+          continue;
+        }
+        CloudRunnerLogger.log(`Tasks ${describeList.length}`);
+        for (const taskElement of describeList) {
+          if (taskElement === undefined) {
+            continue;
+          }
+          taskElement.overrides = {};
+          taskElement.attachments = [];
+          if (taskElement.createdAt === undefined) {
+            CloudRunnerLogger.log(`Skipping ${taskElement.taskDefinitionArn} no createdAt date`);
+            continue;
+          }
+          result.push({ taskElement, element });
+        }
+      }
+    }
+    CloudRunnerLogger.log(``);
+
+    return result;
+  }
+  public static async awsDescribeJob(job: string) {
+    process.env.AWS_REGION = Input.region;
+    const CF = new AWS.CloudFormation();
+    const stack = (await CF.listStacks().promise()).StackSummaries?.find((_x) => _x.StackName === job) || undefined;
+    const stackInfo = (await CF.describeStackResources({ StackName: job }).promise()) || undefined;
+    const stackInfo2 = (await CF.describeStacks({ StackName: job }).promise()) || undefined;
+    if (stack === undefined) {
+      throw new Error('stack not defined');
+    }
+    const ageDate: Date = new Date(Date.now() - stack.CreationTime.getTime());
+    const message = `
+    Task Stack ${stack.StackName}
+    Age D${Math.floor(ageDate.getHours() / 24)} H${ageDate.getHours()} M${ageDate.getMinutes()}
+    ${JSON.stringify(stack, undefined, 4)}
+    ${JSON.stringify(stackInfo, undefined, 4)}
+    ${JSON.stringify(stackInfo2, undefined, 4)}
+    `;
+    CloudRunnerLogger.log(message);
+
+    return message;
+  }
+  public static async getLogGroups() {
+    const result: LogGroups = [];
+    process.env.AWS_REGION = Input.region;
+    const ecs = new AWS.CloudWatchLogs();
+    let logStreamInput: AWS.CloudWatchLogs.DescribeLogGroupsRequest = {
+      /* logGroupNamePrefix: 'game-ci' */
+    };
+    let logGroupsDescribe = await ecs.describeLogGroups(logStreamInput).promise();
+    const logGroups = logGroupsDescribe.logGroups || [];
+    while (logGroupsDescribe.nextToken) {
+      logStreamInput = { /* logGroupNamePrefix: 'game-ci',*/ nextToken: logGroupsDescribe.nextToken };
+      logGroupsDescribe = await ecs.describeLogGroups(logStreamInput).promise();
+      logGroups.push(...(logGroupsDescribe?.logGroups || []));
+    }
+
+    CloudRunnerLogger.log(`Log Groups ${logGroups.length}`);
+    for (const element of logGroups) {
+      if (element.creationTime === undefined) {
+        CloudRunnerLogger.log(`Skipping ${element.logGroupName} no createdAt date`);
+        continue;
+      }
+      const ageDate: Date = new Date(Date.now() - element.creationTime);
+
+      CloudRunnerLogger.log(
+        `Task Stack ${element.logGroupName} - Age D${Math.floor(
+          ageDate.getHours() / 24,
+        )} H${ageDate.getHours()} M${ageDate.getMinutes()}`,
+      );
+      result.push(element);
+    }
+
+    return result;
+  }
+  public static async getLocks() {
+    process.env.AWS_REGION = Input.region;
+    const s3 = new AWS.S3();
+    const listRequest: ListObjectsRequest = {
+      Bucket: CloudRunner.buildParameters.awsStackName,
+    };
+    const results = await s3.listObjects(listRequest).promise();
+
+    return results.Contents || [];
+  }
+}

src/model/cloud-runner/providers/docker/index.ts

@@ -1,20 +1,20 @@
 import BuildParameters from '../../../build-parameters';
-import OrchestratorEnvironmentVariable from '../../options/orchestrator-environment-variable';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
-import OrchestratorLogger from '../../services/core/orchestrator-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { ProviderInterface } from '../provider-interface';
-import OrchestratorSecret from '../../options/orchestrator-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 import Docker from '../../../docker';
 import { Action } from '../../..';
 import { writeFileSync } from 'node:fs';
-import Orchestrator from '../../orchestrator';
+import CloudRunner from '../../cloud-runner';
 import { ProviderResource } from '../provider-resource';
 import { ProviderWorkflow } from '../provider-workflow';
-import { OrchestratorSystem } from '../../services/core/orchestrator-system';
+import { CloudRunnerSystem } from '../../services/core/cloud-runner-system';
 import * as fs from 'node:fs';
 import { CommandHookService } from '../../services/hooks/command-hook-service';
 import { StringKeyValuePair } from '../../../shared-types';
 
-class LocalDockerOrchestrator implements ProviderInterface {
+class LocalDockerCloudRunner implements ProviderInterface {
   public buildParameters!: BuildParameters;
 
   listResources(): Promise<ProviderResource[]> {
@@ -50,15 +50,15 @@ class LocalDockerOrchestrator implements ProviderInterface {
     const { workspace } = Action;
     if (
       fs.existsSync(
-        `${workspace}/orchestrator-cache/cache/build/build-${buildParameters.buildGuid}.tar${
+        `${workspace}/cloud-runner-cache/cache/build/build-${buildParameters.buildGuid}.tar${
-          Orchestrator.buildParameters.useCompressionStrategy ? '.lz4' : ''
+          CloudRunner.buildParameters.useCompressionStrategy ? '.lz4' : ''
         }`,
       )
     ) {
-      await OrchestratorSystem.Run(`ls ${workspace}/orchestrator-cache/cache/build/`);
+      await CloudRunnerSystem.Run(`ls ${workspace}/cloud-runner-cache/cache/build/`);
-      await OrchestratorSystem.Run(
+      await CloudRunnerSystem.Run(
-        `rm -r ${workspace}/orchestrator-cache/cache/build/build-${buildParameters.buildGuid}.tar${
+        `rm -r ${workspace}/cloud-runner-cache/cache/build/build-${buildParameters.buildGuid}.tar${
-          Orchestrator.buildParameters.useCompressionStrategy ? '.lz4' : ''
+          CloudRunner.buildParameters.useCompressionStrategy ? '.lz4' : ''
         }`,
       );
     }
@@ -80,47 +80,22 @@ class LocalDockerOrchestrator implements ProviderInterface {
     commands: string,
     mountdir: string,
     workingdir: string,
-    environment: OrchestratorEnvironmentVariable[],
+    environment: CloudRunnerEnvironmentVariable[],
-    secrets: OrchestratorSecret[],
+    secrets: CloudRunnerSecret[],
   ): Promise<string> {
-    OrchestratorLogger.log(buildGuid);
+    CloudRunnerLogger.log(buildGuid);
-    OrchestratorLogger.log(commands);
+    CloudRunnerLogger.log(commands);
 
     const { workspace, actionFolder } = Action;
     const content: StringKeyValuePair[] = [];
     for (const x of secrets) {
       content.push({ name: x.EnvironmentVariable, value: x.ParameterValue });
     }
-
-    // Replace localhost with host.docker.internal for LocalStack endpoints (similar to K8s)
-    // This allows Docker containers to access LocalStack running on the host
-    const endpointEnvironmentNames = new Set([
-      'AWS_S3_ENDPOINT',
-      'AWS_ENDPOINT',
-      'AWS_CLOUD_FORMATION_ENDPOINT',
-      'AWS_ECS_ENDPOINT',
-      'AWS_KINESIS_ENDPOINT',
-      'AWS_CLOUD_WATCH_LOGS_ENDPOINT',
-      'INPUT_AWSS3ENDPOINT',
-      'INPUT_AWSENDPOINT',
-    ]);
     for (const x of environment) {
-      let value = x.value;
+      content.push({ name: x.name, value: x.value });
-      if (
-        typeof value === 'string' &&
-        endpointEnvironmentNames.has(x.name) &&
-        (value.startsWith('http://localhost') || value.startsWith('http://127.0.0.1'))
-      ) {
-        // Replace localhost with host.docker.internal so containers can access host services
-        value = value
-          .replace('http://localhost', 'http://host.docker.internal')
-          .replace('http://127.0.0.1', 'http://host.docker.internal');
-        OrchestratorLogger.log(`Replaced localhost with host.docker.internal for ${x.name}: ${value}`);
-      }
-      content.push({ name: x.name, value });
     }
 
-    // if (this.buildParameters?.orchestratorIntegrationTests) {
+    // if (this.buildParameters?.cloudRunnerIntegrationTests) {
     //   core.info(JSON.stringify(content, undefined, 4));
     //   core.info(JSON.stringify(secrets, undefined, 4));
     //   core.info(JSON.stringify(environment, undefined, 4));
@@ -137,33 +112,25 @@ class LocalDockerOrchestrator implements ProviderInterface {
 
     // core.info(JSON.stringify({ workspace, actionFolder, ...this.buildParameters, ...content }, undefined, 4));
     const entrypointFilePath = `start.sh`;
-
+    const fileContents = `#!/bin/bash
-    // Use #!/bin/sh for POSIX compatibility (Alpine-based images like rclone/rclone don't have bash)
-    const fileContents = `#!/bin/sh
 set -e
 
-mkdir -p /github/workspace/orchestrator-cache
+mkdir -p /github/workspace/cloud-runner-cache
 mkdir -p /data/cache
-cp -a /github/workspace/orchestrator-cache/. ${sharedFolder}
+cp -a /github/workspace/cloud-runner-cache/. ${sharedFolder}
 ${CommandHookService.ApplyHooksToCommands(commands, this.buildParameters)}
-# Only copy cache directory, exclude retained workspaces to avoid running out of disk space
+cp -a ${sharedFolder}. /github/workspace/cloud-runner-cache/
-if [ -d "${sharedFolder}cache" ]; then
-  cp -a ${sharedFolder}cache/. /github/workspace/orchestrator-cache/cache/ || true
-fi
-# Copy test files from /data/ root to workspace for test assertions
-# This allows tests to write files to /data/ and have them available in the workspace
-find ${sharedFolder} -maxdepth 1 -type f -name "test-*" -exec cp -a {} /github/workspace/orchestrator-cache/ \\; || true
 `;
     writeFileSync(`${workspace}/${entrypointFilePath}`, fileContents, {
       flag: 'w',
     });
 
-    if (Orchestrator.buildParameters.orchestratorDebug) {
+    if (CloudRunner.buildParameters.cloudRunnerDebug) {
-      OrchestratorLogger.log(`Running local-docker: \n ${fileContents}`);
+      CloudRunnerLogger.log(`Running local-docker: \n ${fileContents}`);
     }
 
-    if (fs.existsSync(`${workspace}/orchestrator-cache`)) {
+    if (fs.existsSync(`${workspace}/cloud-runner-cache`)) {
-      await OrchestratorSystem.Run(`ls ${workspace}/orchestrator-cache && du -sh ${workspace}/orchestrator-cache`);
+      await CloudRunnerSystem.Run(`ls ${workspace}/cloud-runner-cache && du -sh ${workspace}/cloud-runner-cache`);
     }
     const exitCode = await Docker.run(
       image,
@@ -193,4 +160,4 @@ find ${sharedFolder} -maxdepth 1 -type f -name "test-*" -exec cp -a {} /github/w
     return myOutput;
   }
 }
-export default LocalDockerOrchestrator;
+export default LocalDockerCloudRunner;

src/model/cloud-runner/providers/k8s/index.ts

@@ -2,22 +2,21 @@ import * as k8s from '@kubernetes/client-node';
 import { BuildParameters } from '../../..';
 import * as core from '@actions/core';
 import { ProviderInterface } from '../provider-interface';
-import OrchestratorSecret from '../../options/orchestrator-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 import KubernetesStorage from './kubernetes-storage';
-import OrchestratorEnvironmentVariable from '../../options/orchestrator-environment-variable';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
 import KubernetesTaskRunner from './kubernetes-task-runner';
 import KubernetesSecret from './kubernetes-secret';
 import KubernetesJobSpecFactory from './kubernetes-job-spec-factory';
 import KubernetesServiceAccount from './kubernetes-service-account';
-import OrchestratorLogger from '../../services/core/orchestrator-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { CoreV1Api } from '@kubernetes/client-node';
-import Orchestrator from '../../orchestrator';
+import CloudRunner from '../../cloud-runner';
 import { ProviderResource } from '../provider-resource';
 import { ProviderWorkflow } from '../provider-workflow';
 import { RemoteClientLogger } from '../../remote-client/remote-client-logger';
 import { KubernetesRole } from './kubernetes-role';
-import { OrchestratorSystem } from '../../services/core/orchestrator-system';
+import { CloudRunnerSystem } from '../../services/core/cloud-runner-system';
-import ResourceTracking from '../../services/core/resource-tracking';
 
 class Kubernetes implements ProviderInterface {
   public static Instance: Kubernetes;
@@ -38,6 +37,7 @@ class Kubernetes implements ProviderInterface {
   public serviceAccountName: string = '';
   public ip: string = '';
 
+  // eslint-disable-next-line no-unused-vars
   constructor(buildParameters: BuildParameters) {
     Kubernetes.Instance = this;
     this.kubeConfig = new k8s.KubeConfig();
@@ -46,8 +46,8 @@ class Kubernetes implements ProviderInterface {
     this.kubeClientApps = this.kubeConfig.makeApiClient(k8s.AppsV1Api);
     this.kubeClientBatch = this.kubeConfig.makeApiClient(k8s.BatchV1Api);
     this.rbacAuthorizationV1Api = this.kubeConfig.makeApiClient(k8s.RbacAuthorizationV1Api);
-    this.namespace = buildParameters.containerNamespace ? buildParameters.containerNamespace : 'default';
+    this.namespace = 'default';
-    OrchestratorLogger.log('Loaded default Kubernetes configuration for this environment');
+    CloudRunnerLogger.log('Loaded default Kubernetes configuration for this environment');
   }
 
   async PushLogUpdate(logs: string) {
@@ -63,7 +63,7 @@ class Kubernetes implements ProviderInterface {
 
     // logs to base64
     logs = Buffer.from(logs).toString('base64');
-    const response = await OrchestratorSystem.Run(`curl -X POST -d "${logs}" ${url}`, false, true);
+    const response = await CloudRunnerSystem.Run(`curl -X POST -d "${logs}" ${url}`, false, true);
     RemoteClientLogger.log(`Pushed logs to ${url} ${response}`);
   }
 
@@ -133,19 +133,16 @@ class Kubernetes implements ProviderInterface {
     commands: string,
     mountdir: string,
     workingdir: string,
-    environment: OrchestratorEnvironmentVariable[],
+    environment: CloudRunnerEnvironmentVariable[],
-    secrets: OrchestratorSecret[],
+    secrets: CloudRunnerSecret[],
   ): Promise<string> {
     try {
-      OrchestratorLogger.log('Orchestrator K8s workflow!');
+      CloudRunnerLogger.log('Cloud Runner K8s workflow!');
-      ResourceTracking.logAllocationSummary('k8s workflow');
-      await ResourceTracking.logDiskUsageSnapshot('k8s workflow (host)');
-      await ResourceTracking.logK3dNodeDiskUsage('k8s workflow (before job)');
 
       // Setup
       const id =
         BuildParameters && BuildParameters.shouldUseRetainedWorkspaceMode(this.buildParameters)
-          ? Orchestrator.lockedWorkspace
+          ? CloudRunner.lockedWorkspace
           : this.buildParameters.buildGuid;
       this.pvcName = `unity-builder-pvc-${id}`;
       await KubernetesStorage.createPersistentVolumeClaim(
@@ -159,134 +156,14 @@ class Kubernetes implements ProviderInterface {
       this.jobName = `unity-builder-job-${this.buildGuid}`;
       this.containerName = `main`;
       await KubernetesSecret.createSecret(secrets, this.secretName, this.namespace, this.kubeClient);
-
-      // For tests, clean up old images before creating job to free space for image pull
-      // IMPORTANT: Preserve the Unity image to avoid re-pulling it
-      if (process.env['orchestratorTests'] === 'true') {
-        try {
-          OrchestratorLogger.log('Cleaning up old images in k3d node before pulling new image...');
-          const { OrchestratorSystem: OrchestratorSystemModule } = await import(
-            '../../services/core/orchestrator-system'
-          );
-
-          // Aggressive cleanup: remove stopped containers and non-Unity images
-          // IMPORTANT: Preserve Unity images (unityci/editor) to avoid re-pulling the 3.9GB image
-          const K3D_NODE_CONTAINERS = ['k3d-unity-builder-agent-0', 'k3d-unity-builder-server-0'];
-          const cleanupCommands: string[] = [];
-
-          for (const NODE of K3D_NODE_CONTAINERS) {
-            // Remove all stopped containers (this frees runtime space but keeps images)
-            cleanupCommands.push(
-              `docker exec ${NODE} sh -c "crictl rm --all 2>/dev/null || true" || true`,
-              `docker exec ${NODE} sh -c "for img in $(crictl images -q 2>/dev/null); do repo=$(crictl inspecti $img --format '{{.repo}}' 2>/dev/null || echo ''); if echo "$repo" | grep -qvE 'unityci/editor|unity'; then crictl rmi $img 2>/dev/null || true; fi; done" || true`,
-              `docker exec ${NODE} sh -c "crictl rmi --prune 2>/dev/null || true" || true`,
-            );
-          }
-
-          for (const cmd of cleanupCommands) {
-            try {
-              await OrchestratorSystemModule.Run(cmd, true, true);
-            } catch (cmdError) {
-              // Ignore individual command failures - cleanup is best effort
-              OrchestratorLogger.log(`Cleanup command failed (non-fatal): ${cmdError}`);
-            }
-          }
-          OrchestratorLogger.log('Cleanup completed (containers and non-Unity images removed, Unity images preserved)');
-        } catch (cleanupError) {
-          OrchestratorLogger.logWarning(`Failed to cleanup images before job creation: ${cleanupError}`);
-
-          // Continue anyway - image might already be cached
-        }
-      }
-
       let output = '';
       try {
-        // Before creating the job, verify we have the Unity image cached on the agent node
+        CloudRunnerLogger.log('Job does not exist');
-        // If not cached, try to ensure it's available to avoid disk pressure during pull
-        if (process.env['orchestratorTests'] === 'true' && image.includes('unityci/editor')) {
-          try {
-            const { OrchestratorSystem: OrchestratorSystemModule2 } = await import(
-              '../../services/core/orchestrator-system'
-            );
-
-            // Check if image is cached on agent node (where pods run)
-            const agentImageCheck = await OrchestratorSystemModule2.Run(
-              `docker exec k3d-unity-builder-agent-0 sh -c "crictl images | grep -q unityci/editor && echo 'cached' || echo 'not_cached'" || echo 'not_cached'`,
-              true,
-              true,
-            );
-
-            if (agentImageCheck.includes('not_cached')) {
-              // Check if image is on server node
-              const serverImageCheck = await OrchestratorSystemModule2.Run(
-                `docker exec k3d-unity-builder-server-0 sh -c "crictl images | grep -q unityci/editor && echo 'cached' || echo 'not_cached'" || echo 'not_cached'`,
-                true,
-                true,
-              );
-
-              // Check available disk space on agent node
-              const diskInfo = await OrchestratorSystemModule2.Run(
-                'docker exec k3d-unity-builder-agent-0 sh -c "df -h /var/lib/rancher/k3s 2>/dev/null | tail -1 || df -h / 2>/dev/null | tail -1 || echo unknown" || echo unknown',
-                true,
-                true,
-              );
-
-              OrchestratorLogger.logWarning(
-                `Unity image not cached on agent node (where pods run). Server node: ${
-                  serverImageCheck.includes('cached') ? 'has image' : 'no image'
-                }. Disk info: ${diskInfo.trim()}. Pod will attempt to pull image (3.9GB) which may fail due to disk pressure.`,
-              );
-
-              // If image is on server but not agent, log a warning
-              // NOTE: We don't attempt to pull here because:
-              // 1. Pulling a 3.9GB image can take several minutes and block the test
-              // 2. If there's not enough disk space, the pull will hang indefinitely
-              // 3. The pod will attempt to pull during scheduling anyway
-              // 4. If the pull fails, Kubernetes will provide proper error messages
-              if (serverImageCheck.includes('cached')) {
-                OrchestratorLogger.logWarning(
-                  'Unity image exists on server node but not agent node. Pod will attempt to pull during scheduling. If pull fails due to disk pressure, ensure cleanup runs before this test.',
-                );
-              } else {
-                // Image not on either node - check if we have enough space to pull
-                // Extract available space from disk info
-                const availableSpaceMatch = diskInfo.match(/(\d+(?:\.\d+)?)\s*([gkm]?i?b)/i);
-                if (availableSpaceMatch) {
-                  const availableValue = Number.parseFloat(availableSpaceMatch[1]);
-                  const availableUnit = availableSpaceMatch[2].toUpperCase();
-                  let availableGB = availableValue;
-
-                  if (availableUnit.includes('M')) {
-                    availableGB = availableValue / 1024;
-                  } else if (availableUnit.includes('K')) {
-                    availableGB = availableValue / (1024 * 1024);
-                  }
-
-                  // Unity image is ~3.9GB, need at least 4.5GB to be safe
-                  if (availableGB < 4.5) {
-                    OrchestratorLogger.logWarning(
-                      `CRITICAL: Unity image not cached and only ${availableGB.toFixed(
-                        2,
-                      )}GB available. Image pull (3.9GB) will likely fail. Consider running cleanup or ensuring pre-pull step succeeds.`,
-                    );
-                  }
-                }
-              }
-            } else {
-              OrchestratorLogger.log('Unity image is cached on agent node - pod should start without pulling');
-            }
-          } catch (checkError) {
-            // Ignore check errors - continue with job creation
-            OrchestratorLogger.logWarning(`Failed to verify Unity image cache: ${checkError}`);
-          }
-        }
-
-        OrchestratorLogger.log('Job does not exist');
         await this.createJob(commands, image, mountdir, workingdir, environment, secrets);
-        OrchestratorLogger.log('Watching pod until running');
+        CloudRunnerLogger.log('Watching pod until running');
         await KubernetesTaskRunner.watchUntilPodRunning(this.kubeClient, this.podName, this.namespace);
 
-        OrchestratorLogger.log('Pod is running');
+        CloudRunnerLogger.log('Pod is running');
         output += await KubernetesTaskRunner.runTask(
           this.kubeConfig,
           this.kubeClient,
@@ -296,9 +173,9 @@ class Kubernetes implements ProviderInterface {
           this.namespace,
         );
       } catch (error: any) {
-        OrchestratorLogger.log(`error running k8s workflow ${error}`);
+        CloudRunnerLogger.log(`error running k8s workflow ${error}`);
         await new Promise((resolve) => setTimeout(resolve, 3000));
-        OrchestratorLogger.log(
+        CloudRunnerLogger.log(
           JSON.stringify(
             (await this.kubeClient.listNamespacedEvent(this.namespace)).body.items
               .map((x) => {
@@ -321,7 +198,7 @@ class Kubernetes implements ProviderInterface {
 
       return output;
     } catch (error) {
-      OrchestratorLogger.log('Running job failed');
+      CloudRunnerLogger.log('Running job failed');
       core.error(JSON.stringify(error, undefined, 4));
 
       // await this.cleanupTaskResources();
@@ -334,8 +211,8 @@ class Kubernetes implements ProviderInterface {
     image: string,
     mountdir: string,
     workingdir: string,
-    environment: OrchestratorEnvironmentVariable[],
+    environment: CloudRunnerEnvironmentVariable[],
-    secrets: OrchestratorSecret[],
+    secrets: CloudRunnerSecret[],
   ) {
     await this.createNamespacedJob(commands, image, mountdir, workingdir, environment, secrets);
     const find = await Kubernetes.findPodFromJob(this.kubeClient, this.jobName, this.namespace);
@@ -359,8 +236,8 @@ class Kubernetes implements ProviderInterface {
     image: string,
     mountdir: string,
     workingdir: string,
-    environment: OrchestratorEnvironmentVariable[],
+    environment: CloudRunnerEnvironmentVariable[],
-    secrets: OrchestratorSecret[],
+    secrets: CloudRunnerSecret[],
   ) {
     for (let index = 0; index < 3; index++) {
       try {
@@ -385,13 +262,13 @@ class Kubernetes implements ProviderInterface {
         // await KubernetesRole.createRole(this.serviceAccountName, this.namespace, this.rbacAuthorizationV1Api);
 
         const result = await this.kubeClientBatch.createNamespacedJob(this.namespace, jobSpec);
-        OrchestratorLogger.log(`Build job created`);
+        CloudRunnerLogger.log(`Build job created`);
         await new Promise((promise) => setTimeout(promise, 5000));
-        OrchestratorLogger.log('Job created');
+        CloudRunnerLogger.log('Job created');
 
         return result.body.metadata?.name;
       } catch (error) {
-        OrchestratorLogger.log(`Error occured creating job: ${error}`);
+        CloudRunnerLogger.log(`Error occured creating job: ${error}`);
         throw error;
       }
     }
@@ -403,26 +280,26 @@ class Kubernetes implements ProviderInterface {
   }
 
   async cleanupTaskResources() {
-    OrchestratorLogger.log('cleaning up');
+    CloudRunnerLogger.log('cleaning up');
     try {
       await this.kubeClientBatch.deleteNamespacedJob(this.jobName, this.namespace);
       await this.kubeClient.deleteNamespacedPod(this.podName, this.namespace);
       await KubernetesRole.deleteRole(this.serviceAccountName, this.namespace, this.rbacAuthorizationV1Api);
     } catch (error: any) {
-      OrchestratorLogger.log(`Failed to cleanup`);
+      CloudRunnerLogger.log(`Failed to cleanup`);
       if (error.response.body.reason !== `NotFound`) {
-        OrchestratorLogger.log(`Wasn't a not found error: ${error.response.body.reason}`);
+        CloudRunnerLogger.log(`Wasn't a not found error: ${error.response.body.reason}`);
         throw error;
       }
     }
     try {
       await this.kubeClient.deleteNamespacedSecret(this.secretName, this.namespace);
     } catch (error: any) {
-      OrchestratorLogger.log(`Failed to cleanup secret`);
+      CloudRunnerLogger.log(`Failed to cleanup secret`);
-      OrchestratorLogger.log(error.response.body.reason);
+      CloudRunnerLogger.log(error.response.body.reason);
     }
-    OrchestratorLogger.log('cleaned up Secret, Job and Pod');
+    CloudRunnerLogger.log('cleaned up Secret, Job and Pod');
-    OrchestratorLogger.log('cleaning up finished');
+    CloudRunnerLogger.log('cleaning up finished');
   }
 
   async cleanupWorkflow(
@@ -435,14 +312,14 @@ class Kubernetes implements ProviderInterface {
     if (BuildParameters && BuildParameters.shouldUseRetainedWorkspaceMode(buildParameters)) {
       return;
     }
-    OrchestratorLogger.log(`deleting PVC`);
+    CloudRunnerLogger.log(`deleting PVC`);
 
     try {
       await this.kubeClient.deleteNamespacedPersistentVolumeClaim(this.pvcName, this.namespace);
       await this.kubeClient.deleteNamespacedServiceAccount(this.serviceAccountName, this.namespace);
-      OrchestratorLogger.log('cleaned up PVC and Service Account');
+      CloudRunnerLogger.log('cleaned up PVC and Service Account');
     } catch (error: any) {
-      OrchestratorLogger.log(`Cleanup failed ${JSON.stringify(error, undefined, 4)}`);
+      CloudRunnerLogger.log(`Cleanup failed ${JSON.stringify(error, undefined, 4)}`);
       throw error;
     }
   }

src/model/cloud-runner/providers/k8s/kubernetes-job-spec-factory.ts

@@ -0,0 +1,127 @@
+import { V1EnvVar, V1EnvVarSource, V1SecretKeySelector } from '@kubernetes/client-node';
+import BuildParameters from '../../../build-parameters';
+import { CommandHookService } from '../../services/hooks/command-hook-service';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
+import CloudRunner from '../../cloud-runner';
+
+class KubernetesJobSpecFactory {
+  static getJobSpec(
+    command: string,
+    image: string,
+    mountdir: string,
+    workingDirectory: string,
+    environment: CloudRunnerEnvironmentVariable[],
+    secrets: CloudRunnerSecret[],
+    buildGuid: string,
+    buildParameters: BuildParameters,
+    secretName: string,
+    pvcName: string,
+    jobName: string,
+    k8s: any,
+    containerName: string,
+    ip: string = '',
+  ) {
+    const job = new k8s.V1Job();
+    job.apiVersion = 'batch/v1';
+    job.kind = 'Job';
+    job.metadata = {
+      name: jobName,
+      labels: {
+        app: 'unity-builder',
+        buildGuid,
+      },
+    };
+    job.spec = {
+      ttlSecondsAfterFinished: 9999,
+      backoffLimit: 0,
+      template: {
+        spec: {
+          volumes: [
+            {
+              name: 'build-mount',
+              persistentVolumeClaim: {
+                claimName: pvcName,
+              },
+            },
+          ],
+          containers: [
+            {
+              ttlSecondsAfterFinished: 9999,
+              name: containerName,
+              image,
+              command: ['/bin/sh'],
+              args: [
+                '-c',
+                `${CommandHookService.ApplyHooksToCommands(`${command}\nsleep 2m`, CloudRunner.buildParameters)}`,
+              ],
+
+              workingDir: `${workingDirectory}`,
+              resources: {
+                requests: {
+                  memory: `${Number.parseInt(buildParameters.containerMemory) / 1024}G` || '750M',
+                  cpu: Number.parseInt(buildParameters.containerCpu) / 1024 || '1',
+                },
+              },
+              env: [
+                ...environment.map((x) => {
+                  const environmentVariable = new V1EnvVar();
+                  environmentVariable.name = x.name;
+                  environmentVariable.value = x.value;
+
+                  return environmentVariable;
+                }),
+                ...secrets.map((x) => {
+                  const secret = new V1EnvVarSource();
+                  secret.secretKeyRef = new V1SecretKeySelector();
+                  secret.secretKeyRef.key = x.ParameterKey;
+                  secret.secretKeyRef.name = secretName;
+                  const environmentVariable = new V1EnvVar();
+                  environmentVariable.name = x.EnvironmentVariable;
+                  environmentVariable.valueFrom = secret;
+
+                  return environmentVariable;
+                }),
+                { name: 'LOG_SERVICE_IP', value: ip },
+              ],
+              volumeMounts: [
+                {
+                  name: 'build-mount',
+                  mountPath: `${mountdir}`,
+                },
+              ],
+              lifecycle: {
+                preStop: {
+                  exec: {
+                    command: [
+                      `wait 60s;
+                      cd /data/builder/action/steps;
+                      chmod +x /return_license.sh;
+                      /return_license.sh;`,
+                    ],
+                  },
+                },
+              },
+            },
+          ],
+          restartPolicy: 'Never',
+        },
+      },
+    };
+
+    if (process.env['CLOUD_RUNNER_MINIKUBE']) {
+      job.spec.template.spec.volumes[0] = {
+        name: 'build-mount',
+        hostPath: {
+          path: `/data`,
+          type: `Directory`,
+        },
+      };
+    }
+
+    job.spec.template.spec.containers[0].resources.requests[`ephemeral-storage`] = '10Gi';
+
+    return job;
+  }
+}
+export default KubernetesJobSpecFactory;

src/model/cloud-runner/providers/k8s/kubernetes-pods.ts

@@ -0,0 +1,23 @@
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
+import { CoreV1Api } from '@kubernetes/client-node';
+class KubernetesPods {
+  public static async IsPodRunning(podName: string, namespace: string, kubeClient: CoreV1Api) {
+    const pods = (await kubeClient.listNamespacedPod(namespace)).body.items.filter((x) => podName === x.metadata?.name);
+    const running = pods.length > 0 && (pods[0].status?.phase === `Running` || pods[0].status?.phase === `Pending`);
+    const phase = pods[0]?.status?.phase || 'undefined status';
+    CloudRunnerLogger.log(`Getting pod status: ${phase}`);
+    if (phase === `Failed`) {
+      throw new Error(`K8s pod failed`);
+    }
+
+    return running;
+  }
+  public static async GetPodStatus(podName: string, namespace: string, kubeClient: CoreV1Api) {
+    const pods = (await kubeClient.listNamespacedPod(namespace)).body.items.find((x) => podName === x.metadata?.name);
+    const phase = pods?.status?.phase || 'undefined status';
+
+    return phase;
+  }
+}
+
+export default KubernetesPods;

src/model/cloud-runner/providers/k8s/kubernetes-secret.ts

@@ -1,12 +1,12 @@
 import { CoreV1Api } from '@kubernetes/client-node';
-import OrchestratorSecret from '../../options/orchestrator-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 import * as k8s from '@kubernetes/client-node';
-import OrchestratorLogger from '../../services/core/orchestrator-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import * as base64 from 'base-64';
 
 class KubernetesSecret {
   static async createSecret(
-    secrets: OrchestratorSecret[],
+    secrets: CloudRunnerSecret[],
     secretName: string,
     namespace: string,
     kubeClient: CoreV1Api,
@@ -23,20 +23,20 @@ class KubernetesSecret {
       for (const buildSecret of secrets) {
         secret.data[buildSecret.ParameterKey] = base64.encode(buildSecret.ParameterValue);
       }
-      OrchestratorLogger.log(`Creating secret: ${secretName}`);
+      CloudRunnerLogger.log(`Creating secret: ${secretName}`);
       const existingSecrets = await kubeClient.listNamespacedSecret(namespace);
       const mappedSecrets = existingSecrets.body.items.map((x) => {
         return x.metadata?.name || `no name`;
       });
 
-      OrchestratorLogger.log(
+      CloudRunnerLogger.log(
         `ExistsAlready: ${mappedSecrets.includes(secretName)} SecretsCount: ${mappedSecrets.length}`,
       );
       await new Promise((promise) => setTimeout(promise, 15000));
       await kubeClient.createNamespacedSecret(namespace, secret);
-      OrchestratorLogger.log('Created secret');
+      CloudRunnerLogger.log('Created secret');
     } catch (error) {
-      OrchestratorLogger.log(`Created secret failed ${error}`);
+      CloudRunnerLogger.log(`Created secret failed ${error}`);
       throw new Error(`Failed to create kubernetes secret`);
     }
   }

src/model/cloud-runner/providers/k8s/kubernetes-storage.ts

@@ -0,0 +1,116 @@
+import { waitUntil } from 'async-wait-until';
+import * as core from '@actions/core';
+import * as k8s from '@kubernetes/client-node';
+import BuildParameters from '../../../build-parameters';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
+import { IncomingMessage } from 'node:http';
+import GitHub from '../../../github';
+
+class KubernetesStorage {
+  public static async createPersistentVolumeClaim(
+    buildParameters: BuildParameters,
+    pvcName: string,
+    kubeClient: k8s.CoreV1Api,
+    namespace: string,
+  ) {
+    if (buildParameters.kubeVolume !== ``) {
+      CloudRunnerLogger.log(`Kube Volume was input was set ${buildParameters.kubeVolume} overriding ${pvcName}`);
+      pvcName = buildParameters.kubeVolume;
+
+      return;
+    }
+    const allPvc = (await kubeClient.listNamespacedPersistentVolumeClaim(namespace)).body.items;
+    const pvcList = allPvc.map((x) => x.metadata?.name);
+    CloudRunnerLogger.log(`Current PVCs in namespace ${namespace}`);
+    CloudRunnerLogger.log(JSON.stringify(pvcList, undefined, 4));
+    if (pvcList.includes(pvcName)) {
+      CloudRunnerLogger.log(`pvc ${pvcName} already exists`);
+      if (GitHub.githubInputEnabled) {
+        core.setOutput('volume', pvcName);
+      }
+
+      return;
+    }
+    CloudRunnerLogger.log(`Creating PVC ${pvcName} (does not exist)`);
+    const result = await KubernetesStorage.createPVC(pvcName, buildParameters, kubeClient, namespace);
+    await KubernetesStorage.handleResult(result, kubeClient, namespace, pvcName);
+  }
+
+  public static async getPVCPhase(kubeClient: k8s.CoreV1Api, name: string, namespace: string) {
+    try {
+      return (await kubeClient.readNamespacedPersistentVolumeClaim(name, namespace)).body.status?.phase;
+    } catch (error) {
+      core.error('Failed to get PVC phase');
+      core.error(JSON.stringify(error, undefined, 4));
+      throw error;
+    }
+  }
+
+  public static async watchUntilPVCNotPending(kubeClient: k8s.CoreV1Api, name: string, namespace: string) {
+    try {
+      CloudRunnerLogger.log(`watch Until PVC Not Pending ${name} ${namespace}`);
+      CloudRunnerLogger.log(`${await this.getPVCPhase(kubeClient, name, namespace)}`);
+      await waitUntil(
+        async () => {
+          return (await this.getPVCPhase(kubeClient, name, namespace)) === 'Pending';
+        },
+        {
+          timeout: 750000,
+          intervalBetweenAttempts: 15000,
+        },
+      );
+    } catch (error: any) {
+      core.error('Failed to watch PVC');
+      core.error(error.toString());
+      core.error(
+        `PVC Body: ${JSON.stringify(
+          (await kubeClient.readNamespacedPersistentVolumeClaim(name, namespace)).body,
+          undefined,
+          4,
+        )}`,
+      );
+      throw error;
+    }
+  }
+
+  private static async createPVC(
+    pvcName: string,
+    buildParameters: BuildParameters,
+    kubeClient: k8s.CoreV1Api,
+    namespace: string,
+  ) {
+    const pvc = new k8s.V1PersistentVolumeClaim();
+    pvc.apiVersion = 'v1';
+    pvc.kind = 'PersistentVolumeClaim';
+    pvc.metadata = {
+      name: pvcName,
+    };
+    pvc.spec = {
+      accessModes: ['ReadWriteOnce'],
+      storageClassName: buildParameters.kubeStorageClass === '' ? 'standard' : buildParameters.kubeStorageClass,
+      resources: {
+        requests: {
+          storage: buildParameters.kubeVolumeSize,
+        },
+      },
+    };
+    const result = await kubeClient.createNamespacedPersistentVolumeClaim(namespace, pvc);
+
+    return result;
+  }
+
+  private static async handleResult(
+    result: { response: IncomingMessage; body: k8s.V1PersistentVolumeClaim },
+    kubeClient: k8s.CoreV1Api,
+    namespace: string,
+    pvcName: string,
+  ) {
+    const name = result.body.metadata?.name || '';
+    CloudRunnerLogger.log(`PVC ${name} created`);
+    await this.watchUntilPVCNotPending(kubeClient, name, namespace);
+    CloudRunnerLogger.log(`PVC ${name} is ready and not pending`);
+    core.setOutput('volume', pvcName);
+  }
+}
+
+export default KubernetesStorage;

src/model/cloud-runner/providers/k8s/kubernetes-task-runner.ts

@@ -0,0 +1,119 @@
+import { CoreV1Api, KubeConfig } from '@kubernetes/client-node';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
+import { waitUntil } from 'async-wait-until';
+import { CloudRunnerSystem } from '../../services/core/cloud-runner-system';
+import CloudRunner from '../../cloud-runner';
+import KubernetesPods from './kubernetes-pods';
+import { FollowLogStreamService } from '../../services/core/follow-log-stream-service';
+
+class KubernetesTaskRunner {
+  static readonly maxRetry: number = 3;
+  static lastReceivedMessage: string = ``;
+
+  static async runTask(
+    kubeConfig: KubeConfig,
+    kubeClient: CoreV1Api,
+    jobName: string,
+    podName: string,
+    containerName: string,
+    namespace: string,
+  ) {
+    let output = '';
+    let shouldReadLogs = true;
+    let shouldCleanup = true;
+    let retriesAfterFinish = 0;
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      await new Promise((resolve) => setTimeout(resolve, 3000));
+      CloudRunnerLogger.log(
+        `Streaming logs from pod: ${podName} container: ${containerName} namespace: ${namespace} ${CloudRunner.buildParameters.kubeVolumeSize}/${CloudRunner.buildParameters.containerCpu}/${CloudRunner.buildParameters.containerMemory}`,
+      );
+      let extraFlags = ``;
+      extraFlags += (await KubernetesPods.IsPodRunning(podName, namespace, kubeClient))
+        ? ` -f -c ${containerName}`
+        : ` --previous`;
+
+      const callback = (outputChunk: string) => {
+        output += outputChunk;
+
+        // split output chunk and handle per line
+        for (const chunk of outputChunk.split(`\n`)) {
+          ({ shouldReadLogs, shouldCleanup, output } = FollowLogStreamService.handleIteration(
+            chunk,
+            shouldReadLogs,
+            shouldCleanup,
+            output,
+          ));
+        }
+      };
+      try {
+        await CloudRunnerSystem.Run(`kubectl logs ${podName}${extraFlags}`, false, true, callback);
+      } catch (error: any) {
+        await new Promise((resolve) => setTimeout(resolve, 3000));
+        const continueStreaming = await KubernetesPods.IsPodRunning(podName, namespace, kubeClient);
+        CloudRunnerLogger.log(`K8s logging error ${error} ${continueStreaming}`);
+        if (continueStreaming) {
+          continue;
+        }
+        if (retriesAfterFinish < KubernetesTaskRunner.maxRetry) {
+          retriesAfterFinish++;
+
+          continue;
+        }
+        throw error;
+      }
+      if (FollowLogStreamService.DidReceiveEndOfTransmission) {
+        CloudRunnerLogger.log('end of log stream');
+        break;
+      }
+    }
+
+    return output;
+  }
+
+  static async watchUntilPodRunning(kubeClient: CoreV1Api, podName: string, namespace: string) {
+    let waitComplete: boolean = false;
+    let message = ``;
+    CloudRunnerLogger.log(`Watching ${podName} ${namespace}`);
+    await waitUntil(
+      async () => {
+        const status = await kubeClient.readNamespacedPodStatus(podName, namespace);
+        const phase = status?.body.status?.phase;
+        waitComplete = phase !== 'Pending';
+        message = `Phase:${status.body.status?.phase} \n Reason:${
+          status.body.status?.conditions?.[0].reason || ''
+        } \n Message:${status.body.status?.conditions?.[0].message || ''}`;
+
+        // CloudRunnerLogger.log(
+        //   JSON.stringify(
+        //     (await kubeClient.listNamespacedEvent(namespace)).body.items
+        //       .map((x) => {
+        //         return {
+        //           message: x.message || ``,
+        //           name: x.metadata.name || ``,
+        //           reason: x.reason || ``,
+        //         };
+        //       })
+        //       .filter((x) => x.name.includes(podName)),
+        //     undefined,
+        //     4,
+        //   ),
+        // );
+        if (waitComplete || phase !== 'Pending') return true;
+
+        return false;
+      },
+      {
+        timeout: 2000000,
+        intervalBetweenAttempts: 15000,
+      },
+    );
+    if (!waitComplete) {
+      CloudRunnerLogger.log(message);
+    }
+
+    return waitComplete;
+  }
+}
+
+export default KubernetesTaskRunner;

src/model/cloud-runner/providers/local/index.ts

@@ -1,14 +1,13 @@
 import BuildParameters from '../../../build-parameters';
-import { OrchestratorSystem } from '../../services/core/orchestrator-system';
+import { CloudRunnerSystem } from '../../services/core/cloud-runner-system';
-import OrchestratorEnvironmentVariable from '../../options/orchestrator-environment-variable';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
-import OrchestratorLogger from '../../services/core/orchestrator-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { ProviderInterface } from '../provider-interface';
-import OrchestratorSecret from '../../options/orchestrator-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 import { ProviderResource } from '../provider-resource';
 import { ProviderWorkflow } from '../provider-workflow';
-import { quote } from 'shell-quote';
 
-class LocalOrchestrator implements ProviderInterface {
+class LocalCloudRunner implements ProviderInterface {
   listResources(): Promise<ProviderResource[]> {
     throw new Error('Method not implemented.');
   }
@@ -59,29 +58,15 @@ class LocalOrchestrator implements ProviderInterface {
     // eslint-disable-next-line no-unused-vars
     workingdir: string,
     // eslint-disable-next-line no-unused-vars
-    environment: OrchestratorEnvironmentVariable[],
+    environment: CloudRunnerEnvironmentVariable[],
     // eslint-disable-next-line no-unused-vars
-    secrets: OrchestratorSecret[],
+    secrets: CloudRunnerSecret[],
   ): Promise<string> {
-    OrchestratorLogger.log(image);
+    CloudRunnerLogger.log(image);
-    OrchestratorLogger.log(buildGuid);
+    CloudRunnerLogger.log(buildGuid);
-    OrchestratorLogger.log(commands);
+    CloudRunnerLogger.log(commands);
 
-    // On Windows, many built-in hooks use POSIX shell syntax. Execute via bash if available.
+    return await CloudRunnerSystem.Run(commands);
-    if (process.platform === 'win32') {
-      const inline = commands
-        .replace(/\r/g, '')
-        .split('\n')
-        .filter((x) => x.trim().length > 0)
-        .join(' ; ');
-
-      // Use shell-quote to properly escape the command string, preventing command injection
-      const bashWrapped = `bash -lc ${quote([inline])}`;
-
-      return await OrchestratorSystem.Run(bashWrapped);
-    }
-
-    return await OrchestratorSystem.Run(commands);
   }
 }
-export default LocalOrchestrator;
+export default LocalCloudRunner;

src/model/cloud-runner/providers/provider-interface.ts

@@ -1,6 +1,6 @@
 import BuildParameters from '../../build-parameters';
-import OrchestratorEnvironmentVariable from '../options/orchestrator-environment-variable';
+import CloudRunnerEnvironmentVariable from '../options/cloud-runner-environment-variable';
-import OrchestratorSecret from '../options/orchestrator-secret';
+import CloudRunnerSecret from '../options/cloud-runner-secret';
 import { ProviderResource } from './provider-resource';
 import { ProviderWorkflow } from './provider-workflow';
 
@@ -35,9 +35,9 @@ export interface ProviderInterface {
     // eslint-disable-next-line no-unused-vars
     workingdir: string,
     // eslint-disable-next-line no-unused-vars
-    environment: OrchestratorEnvironmentVariable[],
+    environment: CloudRunnerEnvironmentVariable[],
     // eslint-disable-next-line no-unused-vars
-    secrets: OrchestratorSecret[],
+    secrets: CloudRunnerSecret[],
   ): Promise<string>;
   garbageCollect(
     // eslint-disable-next-line no-unused-vars

src/model/cloud-runner/providers/test/index.ts

@@ -1,12 +1,12 @@
 import BuildParameters from '../../../build-parameters';
-import OrchestratorEnvironmentVariable from '../../options/orchestrator-environment-variable';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
-import OrchestratorLogger from '../../services/core/orchestrator-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { ProviderInterface } from '../provider-interface';
-import OrchestratorSecret from '../../options/orchestrator-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 import { ProviderResource } from '../provider-resource';
 import { ProviderWorkflow } from '../provider-workflow';
 
-class TestOrchestrator implements ProviderInterface {
+class TestCloudRunner implements ProviderInterface {
   listResources(): Promise<ProviderResource[]> {
     throw new Error('Method not implemented.');
   }
@@ -51,17 +51,17 @@ class TestOrchestrator implements ProviderInterface {
     // eslint-disable-next-line no-unused-vars
     workingdir: string,
     // eslint-disable-next-line no-unused-vars
-    environment: OrchestratorEnvironmentVariable[],
+    environment: CloudRunnerEnvironmentVariable[],
     // eslint-disable-next-line no-unused-vars
-    secrets: OrchestratorSecret[],
+    secrets: CloudRunnerSecret[],
   ): Promise<string> {
-    OrchestratorLogger.log(image);
+    CloudRunnerLogger.log(image);
-    OrchestratorLogger.log(buildGuid);
+    CloudRunnerLogger.log(buildGuid);
-    OrchestratorLogger.log(commands);
+    CloudRunnerLogger.log(commands);
 
     return await new Promise((result) => {
       result(commands);
     });
   }
 }
-export default TestOrchestrator;
+export default TestCloudRunner;

src/model/cloud-runner/remote-client/caching.ts

@@ -0,0 +1,181 @@
+import { assert } from 'node:console';
+import fs from 'node:fs';
+import path from 'node:path';
+import CloudRunner from '../cloud-runner';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
+import { CloudRunnerFolders } from '../options/cloud-runner-folders';
+import { CloudRunnerSystem } from '../services/core/cloud-runner-system';
+import { LfsHashing } from '../services/utility/lfs-hashing';
+import { RemoteClientLogger } from './remote-client-logger';
+import { Cli } from '../../cli/cli';
+import { CliFunction } from '../../cli/cli-functions-repository';
+// eslint-disable-next-line github/no-then
+const fileExists = async (fpath: fs.PathLike) => !!(await fs.promises.stat(fpath).catch(() => false));
+
+export class Caching {
+  @CliFunction(`cache-push`, `push to cache`)
+  static async cachePush() {
+    try {
+      const buildParameter = JSON.parse(process.env.BUILD_PARAMETERS || '{}');
+      CloudRunner.buildParameters = buildParameter;
+      await Caching.PushToCache(
+        Cli.options!['cachePushTo'],
+        Cli.options!['cachePushFrom'],
+        Cli.options!['artifactName'] || '',
+      );
+    } catch (error: any) {
+      CloudRunnerLogger.log(`${error}`);
+    }
+  }
+
+  @CliFunction(`cache-pull`, `pull from cache`)
+  static async cachePull() {
+    try {
+      const buildParameter = JSON.parse(process.env.BUILD_PARAMETERS || '{}');
+      CloudRunner.buildParameters = buildParameter;
+      await Caching.PullFromCache(
+        Cli.options!['cachePushFrom'],
+        Cli.options!['cachePushTo'],
+        Cli.options!['artifactName'] || '',
+      );
+    } catch (error: any) {
+      CloudRunnerLogger.log(`${error}`);
+    }
+  }
+
+  public static async PushToCache(cacheFolder: string, sourceFolder: string, cacheArtifactName: string) {
+    CloudRunnerLogger.log(`Pushing to cache ${sourceFolder}`);
+    cacheArtifactName = cacheArtifactName.replace(' ', '');
+    const startPath = process.cwd();
+    let compressionSuffix = '';
+    if (CloudRunner.buildParameters.useCompressionStrategy === true) {
+      compressionSuffix = `.lz4`;
+    }
+    CloudRunnerLogger.log(`Compression: ${CloudRunner.buildParameters.useCompressionStrategy} ${compressionSuffix}`);
+    try {
+      if (!(await fileExists(cacheFolder))) {
+        await CloudRunnerSystem.Run(`mkdir -p ${cacheFolder}`);
+      }
+      process.chdir(path.resolve(sourceFolder, '..'));
+
+      if (CloudRunner.buildParameters.cloudRunnerDebug === true) {
+        CloudRunnerLogger.log(
+          `Hashed cache folder ${await LfsHashing.hashAllFiles(sourceFolder)} ${sourceFolder} ${path.basename(
+            sourceFolder,
+          )}`,
+        );
+      }
+      const contents = await fs.promises.readdir(path.basename(sourceFolder));
+      CloudRunnerLogger.log(
+        `There is ${contents.length} files/dir in the source folder ${path.basename(sourceFolder)}`,
+      );
+
+      if (contents.length === 0) {
+        CloudRunnerLogger.log(
+          `Did not push source folder to cache because it was empty ${path.basename(sourceFolder)}`,
+        );
+        process.chdir(`${startPath}`);
+
+        return;
+      }
+
+      await CloudRunnerSystem.Run(
+        `tar -cf ${cacheArtifactName}.tar${compressionSuffix} "${path.basename(sourceFolder)}"`,
+      );
+      await CloudRunnerSystem.Run(`du ${cacheArtifactName}.tar${compressionSuffix}`);
+      assert(await fileExists(`${cacheArtifactName}.tar${compressionSuffix}`), 'cache archive exists');
+      assert(await fileExists(path.basename(sourceFolder)), 'source folder exists');
+      await CloudRunnerSystem.Run(`mv ${cacheArtifactName}.tar${compressionSuffix} ${cacheFolder}`);
+      RemoteClientLogger.log(`moved cache entry ${cacheArtifactName} to ${cacheFolder}`);
+      assert(
+        await fileExists(`${path.join(cacheFolder, cacheArtifactName)}.tar${compressionSuffix}`),
+        'cache archive exists inside cache folder',
+      );
+    } catch (error) {
+      process.chdir(`${startPath}`);
+      throw error;
+    }
+    process.chdir(`${startPath}`);
+  }
+  public static async PullFromCache(cacheFolder: string, destinationFolder: string, cacheArtifactName: string = ``) {
+    CloudRunnerLogger.log(`Pulling from cache ${destinationFolder} ${CloudRunner.buildParameters.skipCache}`);
+    if (`${CloudRunner.buildParameters.skipCache}` === `true`) {
+      CloudRunnerLogger.log(`Skipping cache debugSkipCache is true`);
+
+      return;
+    }
+    cacheArtifactName = cacheArtifactName.replace(' ', '');
+    let compressionSuffix = '';
+    if (CloudRunner.buildParameters.useCompressionStrategy === true) {
+      compressionSuffix = `.lz4`;
+    }
+    const startPath = process.cwd();
+    RemoteClientLogger.log(`Caching for (lz4 ${compressionSuffix}) ${path.basename(destinationFolder)}`);
+    try {
+      if (!(await fileExists(cacheFolder))) {
+        await fs.promises.mkdir(cacheFolder);
+      }
+
+      if (!(await fileExists(destinationFolder))) {
+        await fs.promises.mkdir(destinationFolder);
+      }
+
+      const latestInBranch = await (
+        await CloudRunnerSystem.Run(`ls -t "${cacheFolder}" | grep .tar${compressionSuffix}$ | head -1`)
+      )
+        .replace(/\n/g, ``)
+        .replace(`.tar${compressionSuffix}`, '');
+
+      process.chdir(cacheFolder);
+
+      const cacheSelection =
+        cacheArtifactName !== `` && (await fileExists(`${cacheArtifactName}.tar${compressionSuffix}`))
+          ? cacheArtifactName
+          : latestInBranch;
+      await CloudRunnerLogger.log(`cache key ${cacheArtifactName} selection ${cacheSelection}`);
+
+      if (await fileExists(`${cacheSelection}.tar${compressionSuffix}`)) {
+        const resultsFolder = `results${CloudRunner.buildParameters.buildGuid}`;
+        await CloudRunnerSystem.Run(`mkdir -p ${resultsFolder}`);
+        RemoteClientLogger.log(`cache item exists ${cacheFolder}/${cacheSelection}.tar${compressionSuffix}`);
+        const fullResultsFolder = path.join(cacheFolder, resultsFolder);
+        await CloudRunnerSystem.Run(`tar -xf ${cacheSelection}.tar${compressionSuffix} -C ${fullResultsFolder}`);
+        RemoteClientLogger.log(`cache item extracted to ${fullResultsFolder}`);
+        assert(await fileExists(fullResultsFolder), `cache extraction results folder exists`);
+        const destinationParentFolder = path.resolve(destinationFolder, '..');
+
+        if (await fileExists(destinationFolder)) {
+          await fs.promises.rmdir(destinationFolder, { recursive: true });
+        }
+        await CloudRunnerSystem.Run(
+          `mv "${path.join(fullResultsFolder, path.basename(destinationFolder))}" "${destinationParentFolder}"`,
+        );
+        const contents = await fs.promises.readdir(
+          path.join(destinationParentFolder, path.basename(destinationFolder)),
+        );
+        CloudRunnerLogger.log(
+          `There is ${contents.length} files/dir in the cache pulled contents for ${path.basename(destinationFolder)}`,
+        );
+      } else {
+        RemoteClientLogger.logWarning(`cache item ${cacheArtifactName} doesn't exist ${destinationFolder}`);
+        if (cacheSelection !== ``) {
+          RemoteClientLogger.logWarning(
+            `cache item ${cacheArtifactName}.tar${compressionSuffix} doesn't exist ${destinationFolder}`,
+          );
+          throw new Error(`Failed to get cache item, but cache hit was found: ${cacheSelection}`);
+        }
+      }
+    } catch (error) {
+      process.chdir(startPath);
+      throw error;
+    }
+    process.chdir(startPath);
+  }
+
+  public static async handleCachePurging() {
+    if (process.env.PURGE_REMOTE_BUILDER_CACHE !== undefined) {
+      RemoteClientLogger.log(`purging ${CloudRunnerFolders.purgeRemoteCaching}`);
+      fs.promises.rmdir(CloudRunnerFolders.cacheFolder, { recursive: true });
+    }
+  }
+}

src/model/cloud-runner/remote-client/index.ts

@@ -0,0 +1,251 @@
+import fs from 'node:fs';
+import CloudRunner from '../cloud-runner';
+import { CloudRunnerFolders } from '../options/cloud-runner-folders';
+import { Caching } from './caching';
+import { LfsHashing } from '../services/utility/lfs-hashing';
+import { RemoteClientLogger } from './remote-client-logger';
+import path from 'node:path';
+import { assert } from 'node:console';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
+import { CliFunction } from '../../cli/cli-functions-repository';
+import { CloudRunnerSystem } from '../services/core/cloud-runner-system';
+import YAML from 'yaml';
+import GitHub from '../../github';
+import BuildParameters from '../../build-parameters';
+import { Cli } from '../../cli/cli';
+import CloudRunnerOptions from '../options/cloud-runner-options';
+
+export class RemoteClient {
+  @CliFunction(`remote-cli-pre-build`, `sets up a repository, usually before a game-ci build`)
+  static async setupRemoteClient() {
+    CloudRunnerLogger.log(`bootstrap game ci cloud runner...`);
+    if (!(await RemoteClient.handleRetainedWorkspace())) {
+      await RemoteClient.bootstrapRepository();
+    }
+    await RemoteClient.replaceLargePackageReferencesWithSharedReferences();
+    await RemoteClient.runCustomHookFiles(`before-build`);
+  }
+
+  @CliFunction('remote-cli-log-stream', `log stream from standard input`)
+  public static async remoteClientLogStream() {
+    const logFile = Cli.options!['logFile'];
+    process.stdin.resume();
+    process.stdin.setEncoding('utf8');
+
+    let lingeringLine = '';
+
+    process.stdin.on('data', (chunk) => {
+      const lines = chunk.toString().split('\n');
+
+      lines[0] = lingeringLine + lines[0];
+      lingeringLine = lines.pop() || '';
+
+      for (const element of lines) {
+        if (CloudRunnerOptions.providerStrategy !== 'k8s') {
+          CloudRunnerLogger.log(element);
+        } else {
+          fs.appendFileSync(logFile, element);
+          CloudRunnerLogger.log(element);
+        }
+      }
+    });
+
+    process.stdin.on('end', () => {
+      if (CloudRunnerOptions.providerStrategy !== 'k8s') {
+        CloudRunnerLogger.log(lingeringLine);
+      } else {
+        fs.appendFileSync(logFile, lingeringLine);
+        CloudRunnerLogger.log(lingeringLine);
+      }
+    });
+  }
+
+  @CliFunction(`remote-cli-post-build`, `runs a cloud runner build`)
+  public static async remoteClientPostBuild(): Promise<string> {
+    RemoteClientLogger.log(`Running POST build tasks`);
+
+    await Caching.PushToCache(
+      CloudRunnerFolders.ToLinuxFolder(`${CloudRunnerFolders.cacheFolderForCacheKeyFull}/Library`),
+      CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.libraryFolderAbsolute),
+      `lib-${CloudRunner.buildParameters.buildGuid}`,
+    );
+
+    await Caching.PushToCache(
+      CloudRunnerFolders.ToLinuxFolder(`${CloudRunnerFolders.cacheFolderForCacheKeyFull}/build`),
+      CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.projectBuildFolderAbsolute),
+      `build-${CloudRunner.buildParameters.buildGuid}`,
+    );
+
+    if (!BuildParameters.shouldUseRetainedWorkspaceMode(CloudRunner.buildParameters)) {
+      await CloudRunnerSystem.Run(
+        `rm -r ${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}`,
+      );
+    }
+
+    await RemoteClient.runCustomHookFiles(`after-build`);
+
+    // WIP - need to give the pod permissions to create config map
+    await RemoteClientLogger.handleLogManagementPostJob();
+
+    return new Promise((result) => result(``));
+  }
+  static async runCustomHookFiles(hookLifecycle: string) {
+    RemoteClientLogger.log(`RunCustomHookFiles: ${hookLifecycle}`);
+    const gameCiCustomHooksPath = path.join(CloudRunnerFolders.repoPathAbsolute, `game-ci`, `hooks`);
+    try {
+      const files = fs.readdirSync(gameCiCustomHooksPath);
+      for (const file of files) {
+        const fileContents = fs.readFileSync(path.join(gameCiCustomHooksPath, file), `utf8`);
+        const fileContentsObject = YAML.parse(fileContents.toString());
+        if (fileContentsObject.hook === hookLifecycle) {
+          RemoteClientLogger.log(`Active Hook File ${file} \n \n file contents: \n ${fileContents}`);
+          await CloudRunnerSystem.Run(fileContentsObject.commands);
+        }
+      }
+    } catch (error) {
+      RemoteClientLogger.log(JSON.stringify(error, undefined, 4));
+    }
+  }
+  public static async bootstrapRepository() {
+    await CloudRunnerSystem.Run(
+      `mkdir -p ${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}`,
+    );
+    await CloudRunnerSystem.Run(
+      `mkdir -p ${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.cacheFolderForCacheKeyFull)}`,
+    );
+    await RemoteClient.cloneRepoWithoutLFSFiles();
+    await RemoteClient.sizeOfFolder(
+      'repo before lfs cache pull',
+      CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.repoPathAbsolute),
+    );
+    const lfsHashes = await LfsHashing.createLFSHashFiles();
+    if (fs.existsSync(CloudRunnerFolders.libraryFolderAbsolute)) {
+      RemoteClientLogger.logWarning(`!Warning!: The Unity library was included in the git repository`);
+    }
+    await Caching.PullFromCache(
+      CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.lfsCacheFolderFull),
+      CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.lfsFolderAbsolute),
+      `${lfsHashes.lfsGuidSum}`,
+    );
+    await RemoteClient.sizeOfFolder('repo after lfs cache pull', CloudRunnerFolders.repoPathAbsolute);
+    await RemoteClient.pullLatestLFS();
+    await RemoteClient.sizeOfFolder('repo before lfs git pull', CloudRunnerFolders.repoPathAbsolute);
+    await Caching.PushToCache(
+      CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.lfsCacheFolderFull),
+      CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.lfsFolderAbsolute),
+      `${lfsHashes.lfsGuidSum}`,
+    );
+    await Caching.PullFromCache(
+      CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.libraryCacheFolderFull),
+      CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.libraryFolderAbsolute),
+    );
+    await RemoteClient.sizeOfFolder('repo after library cache pull', CloudRunnerFolders.repoPathAbsolute);
+    await Caching.handleCachePurging();
+  }
+
+  private static async sizeOfFolder(message: string, folder: string) {
+    if (CloudRunner.buildParameters.cloudRunnerDebug) {
+      CloudRunnerLogger.log(`Size of ${message}`);
+      await CloudRunnerSystem.Run(`du -sh ${folder}`);
+    }
+  }
+
+  private static async cloneRepoWithoutLFSFiles() {
+    process.chdir(`${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`);
+    if (
+      fs.existsSync(CloudRunnerFolders.repoPathAbsolute) &&
+      !fs.existsSync(path.join(CloudRunnerFolders.repoPathAbsolute, `.git`))
+    ) {
+      await CloudRunnerSystem.Run(`rm -r ${CloudRunnerFolders.repoPathAbsolute}`);
+      CloudRunnerLogger.log(`${CloudRunnerFolders.repoPathAbsolute} repo exists, but no git folder, cleaning up`);
+    }
+
+    if (
+      BuildParameters.shouldUseRetainedWorkspaceMode(CloudRunner.buildParameters) &&
+      fs.existsSync(path.join(CloudRunnerFolders.repoPathAbsolute, `.git`))
+    ) {
+      process.chdir(CloudRunnerFolders.repoPathAbsolute);
+      RemoteClientLogger.log(
+        `${
+          CloudRunnerFolders.repoPathAbsolute
+        } repo exists - skipping clone - retained workspace mode ${BuildParameters.shouldUseRetainedWorkspaceMode(
+          CloudRunner.buildParameters,
+        )}`,
+      );
+      await CloudRunnerSystem.Run(`git fetch && git reset --hard ${CloudRunner.buildParameters.gitSha}`);
+
+      return;
+    }
+
+    RemoteClientLogger.log(`Initializing source repository for cloning with caching of LFS files`);
+    await CloudRunnerSystem.Run(`git config --global advice.detachedHead false`);
+    RemoteClientLogger.log(`Cloning the repository being built:`);
+    await CloudRunnerSystem.Run(`git config --global filter.lfs.smudge "git-lfs smudge --skip -- %f"`);
+    await CloudRunnerSystem.Run(`git config --global filter.lfs.process "git-lfs filter-process --skip"`);
+    try {
+      await CloudRunnerSystem.Run(
+        `git clone ${CloudRunnerFolders.targetBuildRepoUrl} ${path.basename(CloudRunnerFolders.repoPathAbsolute)}`,
+      );
+    } catch (error: any) {
+      throw error;
+    }
+    process.chdir(CloudRunnerFolders.repoPathAbsolute);
+    await CloudRunnerSystem.Run(`git lfs install`);
+    assert(fs.existsSync(`.git`), 'git folder exists');
+    RemoteClientLogger.log(`${CloudRunner.buildParameters.branch}`);
+    if (CloudRunner.buildParameters.gitSha !== undefined) {
+      await CloudRunnerSystem.Run(`git checkout ${CloudRunner.buildParameters.gitSha}`);
+    } else {
+      await CloudRunnerSystem.Run(`git checkout ${CloudRunner.buildParameters.branch}`);
+      RemoteClientLogger.log(`buildParameter Git Sha is empty`);
+    }
+
+    assert(fs.existsSync(path.join(`.git`, `lfs`)), 'LFS folder should not exist before caching');
+    RemoteClientLogger.log(`Checked out ${CloudRunner.buildParameters.branch}`);
+  }
+
+  static async replaceLargePackageReferencesWithSharedReferences() {
+    CloudRunnerLogger.log(`Use Shared Pkgs ${CloudRunner.buildParameters.useLargePackages}`);
+    GitHub.updateGitHubCheck(`Use Shared Pkgs ${CloudRunner.buildParameters.useLargePackages}`, ``);
+    if (CloudRunner.buildParameters.useLargePackages) {
+      const filePath = path.join(CloudRunnerFolders.projectPathAbsolute, `Packages/manifest.json`);
+      let manifest = fs.readFileSync(filePath, 'utf8');
+      manifest = manifest.replace(/LargeContent/g, '../../../LargeContent');
+      fs.writeFileSync(filePath, manifest);
+      CloudRunnerLogger.log(`Package Manifest \n ${manifest}`);
+      GitHub.updateGitHubCheck(`Package Manifest \n ${manifest}`, ``);
+    }
+  }
+
+  private static async pullLatestLFS() {
+    process.chdir(CloudRunnerFolders.repoPathAbsolute);
+    await CloudRunnerSystem.Run(`git config --global filter.lfs.smudge "git-lfs smudge -- %f"`);
+    await CloudRunnerSystem.Run(`git config --global filter.lfs.process "git-lfs filter-process"`);
+    if (!CloudRunner.buildParameters.skipLfs) {
+      await CloudRunnerSystem.Run(`git lfs pull`);
+      RemoteClientLogger.log(`pulled latest LFS files`);
+      assert(fs.existsSync(CloudRunnerFolders.lfsFolderAbsolute));
+    }
+  }
+  static async handleRetainedWorkspace() {
+    RemoteClientLogger.log(
+      `Retained Workspace: ${BuildParameters.shouldUseRetainedWorkspaceMode(CloudRunner.buildParameters)}`,
+    );
+    if (
+      BuildParameters.shouldUseRetainedWorkspaceMode(CloudRunner.buildParameters) &&
+      fs.existsSync(CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)) &&
+      fs.existsSync(CloudRunnerFolders.ToLinuxFolder(path.join(CloudRunnerFolders.repoPathAbsolute, `.git`)))
+    ) {
+      CloudRunnerLogger.log(`Retained Workspace Already Exists!`);
+      process.chdir(CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.repoPathAbsolute));
+      await CloudRunnerSystem.Run(`git fetch`);
+      await CloudRunnerSystem.Run(`git lfs pull`);
+      await CloudRunnerSystem.Run(`git reset --hard "${CloudRunner.buildParameters.gitSha}"`);
+      await CloudRunnerSystem.Run(`git checkout ${CloudRunner.buildParameters.gitSha}`);
+
+      return true;
+    }
+
+    return false;
+  }
+}

src/model/cloud-runner/remote-client/remote-client-logger.ts

@@ -0,0 +1,82 @@
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
+import fs from 'node:fs';
+import path from 'node:path';
+import CloudRunner from '../cloud-runner';
+import CloudRunnerOptions from '../options/cloud-runner-options';
+
+export class RemoteClientLogger {
+  private static get LogFilePath() {
+    return path.join(`/home`, `job-log.txt`);
+  }
+
+  public static log(message: string) {
+    const finalMessage = `[Client] ${message}`;
+    this.appendToFile(finalMessage);
+    CloudRunnerLogger.log(finalMessage);
+  }
+
+  public static logCliError(message: string) {
+    CloudRunnerLogger.log(`[Client][Error] ${message}`);
+  }
+
+  public static logCliDiagnostic(message: string) {
+    CloudRunnerLogger.log(`[Client][Diagnostic] ${message}`);
+  }
+
+  public static logWarning(message: string) {
+    CloudRunnerLogger.logWarning(message);
+  }
+
+  public static appendToFile(message: string) {
+    if (CloudRunner.isCloudRunnerEnvironment) {
+      fs.appendFileSync(RemoteClientLogger.LogFilePath, `${message}\n`);
+    }
+  }
+
+  public static async handleLogManagementPostJob() {
+    if (CloudRunnerOptions.providerStrategy !== 'k8s') {
+      return;
+    }
+    CloudRunnerLogger.log(`Collected Logs`);
+
+    // check for log file not existing
+    if (!fs.existsSync(RemoteClientLogger.LogFilePath)) {
+      CloudRunnerLogger.log(`Log file does not exist`);
+
+      // check if CloudRunner.isCloudRunnerEnvironment is true, log
+      if (!CloudRunner.isCloudRunnerEnvironment) {
+        CloudRunnerLogger.log(`Cloud Runner is not running in a cloud environment, not collecting logs`);
+      }
+
+      return;
+    }
+    CloudRunnerLogger.log(`Log file exist`);
+    await new Promise((resolve) => setTimeout(resolve, 1));
+
+    // let hashedLogs = fs.readFileSync(RemoteClientLogger.LogFilePath).toString();
+    //
+    // hashedLogs = md5(hashedLogs);
+    //
+    // for (let index = 0; index < 3; index++) {
+    //   CloudRunnerLogger.log(`LOGHASH: ${hashedLogs}`);
+    //   const logs = fs.readFileSync(RemoteClientLogger.LogFilePath).toString();
+    //   CloudRunnerLogger.log(`LOGS: ${Buffer.from(logs).toString('base64')}`);
+    //   CloudRunnerLogger.log(
+    //     `Game CI's "Cloud Runner System" will cancel the log when it has successfully received the log data to verify all logs have been received.`,
+    //   );
+    //
+    //   // wait for 15 seconds to allow the log to be sent
+    //   await new Promise((resolve) => setTimeout(resolve, 15000));
+    // }
+  }
+  public static HandleLog(message: string): boolean {
+    if (RemoteClientLogger.value !== '') {
+      RemoteClientLogger.value += `\n`;
+    }
+
+    RemoteClientLogger.value += message;
+
+    return false;
+  }
+  static value: string = '';
+}

src/model/cloud-runner/services/core/cloud-runner-logger.ts

@@ -1,6 +1,6 @@
 import * as core from '@actions/core';
 
-class OrchestratorLogger {
+class CloudRunnerLogger {
   private static timestamp: number;
   private static globalTimestamp: number;
 
@@ -44,4 +44,4 @@ class OrchestratorLogger {
     return Date.now();
   }
 }
-export default OrchestratorLogger;
+export default CloudRunnerLogger;

src/model/cloud-runner/services/core/cloud-runner-result.ts

@@ -1,6 +1,6 @@
 import BuildParameters from '../../../build-parameters';
 
-class OrchestratorResult {
+class CloudRunnerResult {
   public BuildParameters: BuildParameters;
   public BuildResults: string;
   public BuildSucceeded: boolean;
@@ -21,4 +21,4 @@ class OrchestratorResult {
     this.LibraryCacheUsed = libraryCacheUsed;
   }
 }
-export default OrchestratorResult;
+export default CloudRunnerResult;

src/model/cloud-runner/services/core/cloud-runner-system.ts

@@ -1,9 +1,9 @@
 import { exec } from 'child_process';
 import { RemoteClientLogger } from '../../remote-client/remote-client-logger';
 
-export class OrchestratorSystem {
+export class CloudRunnerSystem {
   public static async RunAndReadLines(command: string): Promise<string[]> {
-    const result = await OrchestratorSystem.Run(command, false, true);
+    const result = await CloudRunnerSystem.Run(command, false, true);
 
     return result
       .split(`\n`)

src/model/cloud-runner/services/core/follow-log-stream-service.ts

@@ -1,7 +1,7 @@
 import GitHub from '../../../github';
-import Orchestrator from '../../orchestrator';
+import CloudRunner from '../../cloud-runner';
-import { OrchestratorStatics } from '../../options/orchestrator-statics';
+import { CloudRunnerStatics } from '../../options/cloud-runner-statics';
-import OrchestratorLogger from './orchestrator-logger';
+import CloudRunnerLogger from './cloud-runner-logger';
 import * as core from '@actions/core';
 
 export class FollowLogStreamService {
@@ -11,8 +11,8 @@ export class FollowLogStreamService {
   static errors = ``;
   public static DidReceiveEndOfTransmission = false;
   public static handleIteration(message: string, shouldReadLogs: boolean, shouldCleanup: boolean, output: string) {
-    if (message.includes(`---${Orchestrator.buildParameters.logId}`)) {
+    if (message.includes(`---${CloudRunner.buildParameters.logId}`)) {
-      OrchestratorLogger.log('End of log transmission received');
+      CloudRunnerLogger.log('End of log transmission received');
       FollowLogStreamService.DidReceiveEndOfTransmission = true;
       shouldReadLogs = false;
     } else if (message.includes('Rebuilding Library because the asset database could not be found!')) {
@@ -47,10 +47,10 @@ export class FollowLogStreamService {
     } else if (message.toLowerCase().includes('cannot be found')) {
       FollowLogStreamService.errors += `\n${message}`;
     }
-
+    if (CloudRunner.buildParameters.cloudRunnerDebug) {
-    // Always append log lines to output so tests can assert on BuildResults
+      output += `${message}\n`;
-    output += `${message}\n`;
+    }
-    OrchestratorLogger.log(`[${OrchestratorStatics.logPrefix}] ${message}`);
+    CloudRunnerLogger.log(`[${CloudRunnerStatics.logPrefix}] ${message}`);
 
     return { shouldReadLogs, shouldCleanup, output };
   }

src/model/cloud-runner/services/core/shared-workspace-locking.ts

@@ -1,112 +1,23 @@
-import OrchestratorLogger from './orchestrator-logger';
+import { CloudRunnerSystem } from './cloud-runner-system';
+import fs from 'node:fs';
+import CloudRunnerLogger from './cloud-runner-logger';
 import BuildParameters from '../../../build-parameters';
-import Orchestrator from '../../orchestrator';
+import CloudRunner from '../../cloud-runner';
-import Input from '../../../input';
-import {
-  CreateBucketCommand,
-  DeleteObjectCommand,
-  HeadBucketCommand,
-  ListObjectsV2Command,
-  PutObjectCommand,
-  S3,
-} from '@aws-sdk/client-s3';
-import { AwsClientFactory } from '../../providers/aws/aws-client-factory';
-import { promisify } from 'node:util';
-import { exec as execCallback } from 'node:child_process';
-const exec = promisify(execCallback);
 export class SharedWorkspaceLocking {
-  private static _s3: S3;
-  private static get s3(): S3 {
-    if (!SharedWorkspaceLocking._s3) {
-      // Use factory so LocalStack endpoint/path-style settings are honored
-      SharedWorkspaceLocking._s3 = AwsClientFactory.getS3();
-    }
-
-    return SharedWorkspaceLocking._s3;
-  }
-  private static get useRclone() {
-    return Orchestrator.buildParameters.storageProvider === 'rclone';
-  }
-  private static async rclone(command: string): Promise<string> {
-    const { stdout } = await exec(`rclone ${command}`);
-
-    return stdout.toString();
-  }
-  private static get bucket() {
-    return SharedWorkspaceLocking.useRclone
-      ? Orchestrator.buildParameters.rcloneRemote
-      : Orchestrator.buildParameters.awsStackName;
-  }
   public static get workspaceBucketRoot() {
-    return SharedWorkspaceLocking.useRclone
+    return `s3://${CloudRunner.buildParameters.awsStackName}/`;
-      ? `${SharedWorkspaceLocking.bucket}/`
-      : `s3://${SharedWorkspaceLocking.bucket}/`;
   }
   public static get workspaceRoot() {
     return `${SharedWorkspaceLocking.workspaceBucketRoot}locks/`;
   }
-  private static get workspacePrefix() {
-    return `locks/`;
-  }
-  private static async ensureBucketExists(): Promise<void> {
-    const bucket = SharedWorkspaceLocking.bucket;
-    if (SharedWorkspaceLocking.useRclone) {
-      try {
-        await SharedWorkspaceLocking.rclone(`lsf ${bucket}`);
-      } catch {
-        await SharedWorkspaceLocking.rclone(`mkdir ${bucket}`);
-      }
-
-      return;
-    }
-    try {
-      await SharedWorkspaceLocking.s3.send(new HeadBucketCommand({ Bucket: bucket }));
-    } catch {
-      const region = Input.region || process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION || 'us-east-1';
-      const createParameters: any = { Bucket: bucket };
-      if (region && region !== 'us-east-1') {
-        createParameters.CreateBucketConfiguration = { LocationConstraint: region };
-      }
-      await SharedWorkspaceLocking.s3.send(new CreateBucketCommand(createParameters));
-    }
-  }
-  private static async listObjects(prefix: string, bucket = SharedWorkspaceLocking.bucket): Promise<string[]> {
-    await SharedWorkspaceLocking.ensureBucketExists();
-    if (prefix !== '' && !prefix.endsWith('/')) {
-      prefix += '/';
-    }
-    if (SharedWorkspaceLocking.useRclone) {
-      const path = `${bucket}/${prefix}`;
-      try {
-        const output = await SharedWorkspaceLocking.rclone(`lsjson ${path}`);
-        const json = JSON.parse(output) as { Name: string; IsDir: boolean }[];
-
-        return json.map((entry) => (entry.IsDir ? `${entry.Name}/` : entry.Name));
-      } catch {
-        return [];
-      }
-    }
-    const result = await SharedWorkspaceLocking.s3.send(
-      new ListObjectsV2Command({ Bucket: bucket, Prefix: prefix, Delimiter: '/' }),
-    );
-    const entries: string[] = [];
-    for (const p of result.CommonPrefixes || []) {
-      if (p.Prefix) entries.push(p.Prefix.slice(prefix.length));
-    }
-    for (const c of result.Contents || []) {
-      if (c.Key && c.Key !== prefix) entries.push(c.Key.slice(prefix.length));
-    }
-
-    return entries;
-  }
   public static async GetAllWorkspaces(buildParametersContext: BuildParameters): Promise<string[]> {
     if (!(await SharedWorkspaceLocking.DoesCacheKeyTopLevelExist(buildParametersContext))) {
       return [];
     }
 
     return (
-      await SharedWorkspaceLocking.listObjects(
+      await SharedWorkspaceLocking.ReadLines(
-        `${SharedWorkspaceLocking.workspacePrefix}${buildParametersContext.cacheKey}/`,
+        `aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`,
       )
     )
       .map((x) => x.replace(`/`, ``))
@@ -115,11 +26,13 @@ export class SharedWorkspaceLocking {
   }
   public static async DoesCacheKeyTopLevelExist(buildParametersContext: BuildParameters) {
     try {
-      const rootLines = await SharedWorkspaceLocking.listObjects('');
+      const rootLines = await SharedWorkspaceLocking.ReadLines(
+        `aws s3 ls ${SharedWorkspaceLocking.workspaceBucketRoot}`,
+      );
       const lockFolderExists = rootLines.map((x) => x.replace(`/`, ``)).includes(`locks`);
 
       if (lockFolderExists) {
-        const lines = await SharedWorkspaceLocking.listObjects(SharedWorkspaceLocking.workspacePrefix);
+        const lines = await SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}`);
 
         return lines.map((x) => x.replace(`/`, ``)).includes(buildParametersContext.cacheKey);
       } else {
@@ -131,7 +44,7 @@ export class SharedWorkspaceLocking {
   }
 
   public static NewWorkspaceName() {
-    return `${Orchestrator.retainedWorkspacePrefix}-${Orchestrator.buildParameters.buildGuid}`;
+    return `${CloudRunner.retainedWorkspacePrefix}-${CloudRunner.buildParameters.buildGuid}`;
   }
   public static async GetAllLocksForWorkspace(
     workspace: string,
@@ -142,8 +55,8 @@ export class SharedWorkspaceLocking {
     }
 
     return (
-      await SharedWorkspaceLocking.listObjects(
+      await SharedWorkspaceLocking.ReadLines(
-        `${SharedWorkspaceLocking.workspacePrefix}${buildParametersContext.cacheKey}/`,
+        `aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`,
       )
     )
       .map((x) => x.replace(`/`, ``))
@@ -156,10 +69,10 @@ export class SharedWorkspaceLocking {
 
     if (await SharedWorkspaceLocking.DoesCacheKeyTopLevelExist(buildParametersContext)) {
       const workspaces = await SharedWorkspaceLocking.GetFreeWorkspaces(buildParametersContext);
-      OrchestratorLogger.log(`run agent ${runId} is trying to access a workspace, free: ${JSON.stringify(workspaces)}`);
+      CloudRunnerLogger.log(`run agent ${runId} is trying to access a workspace, free: ${JSON.stringify(workspaces)}`);
       for (const element of workspaces) {
         const lockResult = await SharedWorkspaceLocking.LockWorkspace(element, runId, buildParametersContext);
-        OrchestratorLogger.log(
+        CloudRunnerLogger.log(
           `run agent: ${runId} try lock workspace: ${element} locking attempt result: ${lockResult}`,
         );
 
@@ -171,12 +84,12 @@ export class SharedWorkspaceLocking {
 
     if (await SharedWorkspaceLocking.DoesWorkspaceExist(workspace, buildParametersContext)) {
       workspace = SharedWorkspaceLocking.NewWorkspaceName();
-      Orchestrator.lockedWorkspace = workspace;
+      CloudRunner.lockedWorkspace = workspace;
     }
 
     const createResult = await SharedWorkspaceLocking.CreateWorkspace(workspace, buildParametersContext);
     const lockResult = await SharedWorkspaceLocking.LockWorkspace(workspace, runId, buildParametersContext);
-    OrchestratorLogger.log(
+    CloudRunnerLogger.log(
       `run agent ${runId} didn't find a free workspace so created: ${workspace} createWorkspaceSuccess: ${createResult} Lock:${lockResult}`,
     );
 
@@ -204,7 +117,7 @@ export class SharedWorkspaceLocking {
       .sort((x) => x.timestamp);
     const lockMatches = locks.filter((x) => x.name.includes(runId));
     const includesRunLock = lockMatches.length > 0 && locks.indexOf(lockMatches[0]) === 0;
-    OrchestratorLogger.log(
+    CloudRunnerLogger.log(
       `Checking has workspace lock, runId: ${runId}, workspace: ${workspace}, success: ${includesRunLock} \n- Num of locks created by Run Agent: ${
         lockMatches.length
       } Num of Locks: ${locks.length}, Time ordered index for Run Agent: ${locks.indexOf(lockMatches[0])} \n \n`,
@@ -219,7 +132,7 @@ export class SharedWorkspaceLocking {
     for (const element of workspaces) {
       const isLocked = await SharedWorkspaceLocking.IsWorkspaceLocked(element, buildParametersContext);
       const isBelowMax = await SharedWorkspaceLocking.IsWorkspaceBelowMax(element, buildParametersContext);
-      OrchestratorLogger.log(`workspace ${element} locked:${isLocked} below max:${isBelowMax}`);
+      CloudRunnerLogger.log(`workspace ${element} locked:${isLocked} below max:${isBelowMax}`);
       if (!isLocked && isBelowMax) {
         result.push(element);
       }
@@ -269,8 +182,8 @@ export class SharedWorkspaceLocking {
     }
 
     return (
-      await SharedWorkspaceLocking.listObjects(
+      await SharedWorkspaceLocking.ReadLines(
-        `${SharedWorkspaceLocking.workspacePrefix}${buildParametersContext.cacheKey}/`,
+        `aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`,
       )
     )
       .map((x) => x.replace(`/`, ``))
@@ -282,8 +195,8 @@ export class SharedWorkspaceLocking {
     if (!(await SharedWorkspaceLocking.DoesWorkspaceExist(workspace, buildParametersContext))) {
       throw new Error(`workspace doesn't exist ${workspace}`);
     }
-    const files = await SharedWorkspaceLocking.listObjects(
+    const files = await SharedWorkspaceLocking.ReadLines(
-      `${SharedWorkspaceLocking.workspacePrefix}${buildParametersContext.cacheKey}/`,
+      `aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/`,
     );
 
     const lockFilesExist =
@@ -299,19 +212,20 @@ export class SharedWorkspaceLocking {
       throw new Error(`${workspace} already exists`);
     }
     const timestamp = Date.now();
-    const key = `${SharedWorkspaceLocking.workspacePrefix}${buildParametersContext.cacheKey}/${timestamp}_${workspace}_workspace`;
+    const file = `${timestamp}_${workspace}_workspace`;
-    await SharedWorkspaceLocking.ensureBucketExists();
+    fs.writeFileSync(file, '');
-    await (SharedWorkspaceLocking.useRclone
+    await CloudRunnerSystem.Run(
-      ? SharedWorkspaceLocking.rclone(`touch ${SharedWorkspaceLocking.bucket}/${key}`)
+      `aws s3 cp ./${file} ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`,
-      : SharedWorkspaceLocking.s3.send(
+      false,
-          new PutObjectCommand({ Bucket: SharedWorkspaceLocking.bucket, Key: key, Body: new Uint8Array(0) }),
+      true,
-        ));
+    );
+    fs.rmSync(file);
 
     const workspaces = await SharedWorkspaceLocking.GetAllWorkspaces(buildParametersContext);
 
-    OrchestratorLogger.log(`All workspaces ${workspaces}`);
+    CloudRunnerLogger.log(`All workspaces ${workspaces}`);
     if (!(await SharedWorkspaceLocking.IsWorkspaceBelowMax(workspace, buildParametersContext))) {
-      OrchestratorLogger.log(`Workspace is above max ${workspaces} ${buildParametersContext.maxRetainedWorkspaces}`);
+      CloudRunnerLogger.log(`Workspace is above max ${workspaces} ${buildParametersContext.maxRetainedWorkspaces}`);
       await SharedWorkspaceLocking.CleanupWorkspace(workspace, buildParametersContext);
 
       return false;
@@ -327,24 +241,25 @@ export class SharedWorkspaceLocking {
   ): Promise<boolean> {
     const existingWorkspace = workspace.endsWith(`_workspace`);
     const ending = existingWorkspace ? workspace : `${workspace}_workspace`;
-    const key = `${SharedWorkspaceLocking.workspacePrefix}${
+    const file = `${Date.now()}_${runId}_${ending}_lock`;
-      buildParametersContext.cacheKey
+    fs.writeFileSync(file, '');
-    }/${Date.now()}_${runId}_${ending}_lock`;
+    await CloudRunnerSystem.Run(
-    await SharedWorkspaceLocking.ensureBucketExists();
+      `aws s3 cp ./${file} ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`,
-    await (SharedWorkspaceLocking.useRclone
+      false,
-      ? SharedWorkspaceLocking.rclone(`touch ${SharedWorkspaceLocking.bucket}/${key}`)
+      true,
-      : SharedWorkspaceLocking.s3.send(
+    );
-          new PutObjectCommand({ Bucket: SharedWorkspaceLocking.bucket, Key: key, Body: new Uint8Array(0) }),
+    fs.rmSync(file);
-        ));
 
     const hasLock = await SharedWorkspaceLocking.HasWorkspaceLock(workspace, runId, buildParametersContext);
 
     if (hasLock) {
-      Orchestrator.lockedWorkspace = workspace;
+      CloudRunner.lockedWorkspace = workspace;
     } else {
-      await (SharedWorkspaceLocking.useRclone
+      await CloudRunnerSystem.Run(
-        ? SharedWorkspaceLocking.rclone(`delete ${SharedWorkspaceLocking.bucket}/${key}`)
+        `aws s3 rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`,
-        : SharedWorkspaceLocking.s3.send(new DeleteObjectCommand({ Bucket: SharedWorkspaceLocking.bucket, Key: key })));
+        false,
+        true,
+      );
     }
 
     return hasLock;
@@ -355,47 +270,30 @@ export class SharedWorkspaceLocking {
     runId: string,
     buildParametersContext: BuildParameters,
   ): Promise<boolean> {
-    await SharedWorkspaceLocking.ensureBucketExists();
     const files = await SharedWorkspaceLocking.GetAllLocksForWorkspace(workspace, buildParametersContext);
     const file = files.find((x) => x.includes(workspace) && x.endsWith(`_lock`) && x.includes(runId));
-    OrchestratorLogger.log(`All Locks ${files} ${workspace} ${runId}`);
+    CloudRunnerLogger.log(`All Locks ${files} ${workspace} ${runId}`);
-    OrchestratorLogger.log(`Deleting lock ${workspace}/${file}`);
+    CloudRunnerLogger.log(`Deleting lock ${workspace}/${file}`);
-    OrchestratorLogger.log(`rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`);
+    CloudRunnerLogger.log(`rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`);
-    if (file) {
+    await CloudRunnerSystem.Run(
-      await (SharedWorkspaceLocking.useRclone
+      `aws s3 rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey}/${file}`,
-        ? SharedWorkspaceLocking.rclone(
+      false,
-            `delete ${SharedWorkspaceLocking.bucket}/${SharedWorkspaceLocking.workspacePrefix}${buildParametersContext.cacheKey}/${file}`,
+      true,
-          )
+    );
-        : SharedWorkspaceLocking.s3.send(
-            new DeleteObjectCommand({
-              Bucket: SharedWorkspaceLocking.bucket,
-              Key: `${SharedWorkspaceLocking.workspacePrefix}${buildParametersContext.cacheKey}/${file}`,
-            }),
-          ));
-    }
 
     return !(await SharedWorkspaceLocking.HasWorkspaceLock(workspace, runId, buildParametersContext));
   }
 
   public static async CleanupWorkspace(workspace: string, buildParametersContext: BuildParameters) {
-    const prefix = `${SharedWorkspaceLocking.workspacePrefix}${buildParametersContext.cacheKey}/`;
+    await CloudRunnerSystem.Run(
-    const files = await SharedWorkspaceLocking.listObjects(prefix);
+      `aws s3 rm ${SharedWorkspaceLocking.workspaceRoot}${buildParametersContext.cacheKey} --exclude "*" --include "*_${workspace}_*"`,
-    for (const file of files.filter((x) => x.includes(`_${workspace}_`))) {
+      false,
-      await (SharedWorkspaceLocking.useRclone
+      true,
-        ? SharedWorkspaceLocking.rclone(`delete ${SharedWorkspaceLocking.bucket}/${prefix}${file}`)
+    );
-        : SharedWorkspaceLocking.s3.send(
-            new DeleteObjectCommand({ Bucket: SharedWorkspaceLocking.bucket, Key: `${prefix}${file}` }),
-          ));
-    }
   }
 
   public static async ReadLines(command: string): Promise<string[]> {
-    const path = command.replace('aws s3 ls', '').replace('rclone lsf', '').trim();
+    return CloudRunnerSystem.RunAndReadLines(command);
-    const withoutScheme = path.replace('s3://', '');
-    const [bucket, ...rest] = withoutScheme.split('/');
-    const prefix = rest.join('/');
-
-    return SharedWorkspaceLocking.listObjects(prefix, bucket);
   }
 }
 

src/model/cloud-runner/services/core/task-parameter-serializer.ts

@@ -1,10 +1,10 @@
 import BuildParameters from '../../../build-parameters';
 import Input from '../../../input';
-import OrchestratorOptions from '../../options/orchestrator-options';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
-import OrchestratorEnvironmentVariable from '../../options/orchestrator-environment-variable';
+import CloudRunnerEnvironmentVariable from '../../options/cloud-runner-environment-variable';
-import OrchestratorOptionsReader from '../../options/orchestrator-options-reader';
+import CloudRunnerOptionsReader from '../../options/cloud-runner-options-reader';
-import OrchestratorQueryOverride from '../../options/orchestrator-query-override';
+import CloudRunnerQueryOverride from '../../options/cloud-runner-query-override';
-import OrchestratorSecret from '../../options/orchestrator-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 import { CommandHookService } from '../hooks/command-hook-service';
 
 export class TaskParameterSerializer {
@@ -19,10 +19,10 @@ export class TaskParameterSerializer {
     'NAME',
     'CUSTOM_JOB',
   ]);
-  public static createOrchestratorEnvironmentVariables(
+  public static createCloudRunnerEnvironmentVariables(
     buildParameters: BuildParameters,
-  ): OrchestratorEnvironmentVariable[] {
+  ): CloudRunnerEnvironmentVariable[] {
-    const result: OrchestratorEnvironmentVariable[] = this.uniqBy(
+    const result: CloudRunnerEnvironmentVariable[] = this.uniqBy(
       [
         ...[
           { name: 'BUILD_TARGET', value: buildParameters.targetPlatform },
@@ -31,11 +31,8 @@ export class TaskParameterSerializer {
         ],
         ...TaskParameterSerializer.serializeFromObject(buildParameters),
         ...TaskParameterSerializer.serializeInput(),
-        ...TaskParameterSerializer.serializeOrchestratorOptions(),
+        ...TaskParameterSerializer.serializeCloudRunnerOptions(),
         ...CommandHookService.getSecrets(CommandHookService.getHooks(buildParameters.commandHooks)),
-
-        // Include AWS environment variables for LocalStack compatibility
-        ...TaskParameterSerializer.serializeAwsEnvironmentVariables(),
       ]
         .filter(
           (x) =>
@@ -50,14 +47,14 @@ export class TaskParameterSerializer {
 
           return x;
         }),
-      (item: OrchestratorEnvironmentVariable) => item.name,
+      (item: CloudRunnerEnvironmentVariable) => item.name,
     );
 
     return result;
   }
 
   // eslint-disable-next-line no-unused-vars
-  static uniqBy(a: OrchestratorEnvironmentVariable[], key: (parameters: OrchestratorEnvironmentVariable) => string) {
+  static uniqBy(a: CloudRunnerEnvironmentVariable[], key: (parameters: CloudRunnerEnvironmentVariable) => string) {
     const seen: { [key: string]: boolean } = {};
 
     return a.filter(function (item) {
@@ -90,34 +87,12 @@ export class TaskParameterSerializer {
     return TaskParameterSerializer.serializeFromType(Input);
   }
 
-  private static serializeOrchestratorOptions() {
+  private static serializeCloudRunnerOptions() {
-    return TaskParameterSerializer.serializeFromType(OrchestratorOptions);
+    return TaskParameterSerializer.serializeFromType(CloudRunnerOptions);
-  }
-
-  private static serializeAwsEnvironmentVariables() {
-    const awsEnvironmentVariables = [
-      'AWS_ACCESS_KEY_ID',
-      'AWS_SECRET_ACCESS_KEY',
-      'AWS_DEFAULT_REGION',
-      'AWS_REGION',
-      'AWS_S3_ENDPOINT',
-      'AWS_ENDPOINT',
-      'AWS_CLOUD_FORMATION_ENDPOINT',
-      'AWS_ECS_ENDPOINT',
-      'AWS_KINESIS_ENDPOINT',
-      'AWS_CLOUD_WATCH_LOGS_ENDPOINT',
-    ];
-
-    return awsEnvironmentVariables
-      .filter((key) => process.env[key] !== undefined)
-      .map((key) => ({
-        name: key,
-        value: process.env[key] || '',
-      }));
   }
 
   public static ToEnvVarFormat(input: string): string {
-    return OrchestratorOptions.ToEnvVarFormat(input);
+    return CloudRunnerOptions.ToEnvVarFormat(input);
   }
 
   public static UndoEnvVarFormat(element: string): string {
@@ -153,7 +128,7 @@ export class TaskParameterSerializer {
 
   private static serializeFromType(type: any) {
     const array: any[] = [];
-    const input = OrchestratorOptionsReader.GetProperties();
+    const input = CloudRunnerOptionsReader.GetProperties();
     for (const element of input) {
       if (typeof type[element] !== 'function' && array.filter((x) => x.name === element).length === 0) {
         array.push({
@@ -166,7 +141,7 @@ export class TaskParameterSerializer {
     return array;
   }
 
-  public static readDefaultSecrets(): OrchestratorSecret[] {
+  public static readDefaultSecrets(): CloudRunnerSecret[] {
     let array = new Array();
     array = TaskParameterSerializer.tryAddInput(array, 'UNITY_SERIAL');
     array = TaskParameterSerializer.tryAddInput(array, 'UNITY_EMAIL');
@@ -179,13 +154,13 @@ export class TaskParameterSerializer {
   }
 
   private static getValue(key: string) {
-    return OrchestratorQueryOverride.queryOverrides !== undefined &&
+    return CloudRunnerQueryOverride.queryOverrides !== undefined &&
-      OrchestratorQueryOverride.queryOverrides[key] !== undefined
+      CloudRunnerQueryOverride.queryOverrides[key] !== undefined
-      ? OrchestratorQueryOverride.queryOverrides[key]
+      ? CloudRunnerQueryOverride.queryOverrides[key]
       : process.env[key];
   }
 
-  private static tryAddInput(array: OrchestratorSecret[], key: string): OrchestratorSecret[] {
+  private static tryAddInput(array: CloudRunnerSecret[], key: string): CloudRunnerSecret[] {
     const value = TaskParameterSerializer.getValue(key);
     if (value !== undefined && value !== '' && value !== 'null') {
       array.push({

src/model/cloud-runner/services/hooks/command-hook-service.ts

@@ -2,26 +2,26 @@ import { BuildParameters, Input } from '../../..';
 import YAML from 'yaml';
 import { RemoteClientLogger } from '../../remote-client/remote-client-logger';
 import path from 'node:path';
-import OrchestratorOptions from '../../options/orchestrator-options';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
 import * as fs from 'node:fs';
-import OrchestratorLogger from '../core/orchestrator-logger';
+import CloudRunnerLogger from '../core/cloud-runner-logger';
 import { CommandHook } from './command-hook';
 
-// import OrchestratorLogger from './orchestrator-logger';
+// import CloudRunnerLogger from './cloud-runner-logger';
 
 export class CommandHookService {
   public static ApplyHooksToCommands(commands: string, buildParameters: BuildParameters): string {
     const hooks = CommandHookService.getHooks(buildParameters.commandHooks);
-    OrchestratorLogger.log(`Applying hooks ${hooks.length}`);
+    CloudRunnerLogger.log(`Applying hooks ${hooks.length}`);
 
     return `echo "---"
-echo "start orchestrator init"
+echo "start cloud runner init"
-${OrchestratorOptions.orchestratorDebug ? `printenv` : `#`}
+${CloudRunnerOptions.cloudRunnerDebug ? `printenv` : `#`}
-echo "start of orchestrator job"
+echo "start of cloud runner job"
 ${hooks.filter((x) => x.hook.includes(`before`)).map((x) => x.commands) || ' '}
 ${commands}
 ${hooks.filter((x) => x.hook.includes(`after`)).map((x) => x.commands) || ' '}
-echo "end of orchestrator job"
+echo "end of cloud runner job"
 echo "---${buildParameters.logId}"`;
   }
 
@@ -51,7 +51,7 @@ echo "---${buildParameters.logId}"`;
       const gameCiCustomHooksPath = path.join(process.cwd(), `game-ci`, `command-hooks`);
       const files = fs.readdirSync(gameCiCustomHooksPath);
       for (const file of files) {
-        if (!OrchestratorOptions.commandHookFiles.includes(file.replace(`.yaml`, ``))) {
+        if (!CloudRunnerOptions.commandHookFiles.includes(file.replace(`.yaml`, ``))) {
           continue;
         }
         const fileContents = fs.readFileSync(path.join(gameCiCustomHooksPath, file), `utf8`);
@@ -89,9 +89,9 @@ echo "---${buildParameters.logId}"`;
       return [];
     }
 
-    // if (Orchestrator.buildParameters?.orchestratorIntegrationTests) {
+    // if (CloudRunner.buildParameters?.cloudRunnerIntegrationTests) {
 
-    // OrchestratorLogger.log(`Parsing build hooks: ${steps}`);
+    // CloudRunnerLogger.log(`Parsing build hooks: ${steps}`);
 
     // }
     const isArray = hooks.replace(/\s/g, ``)[0] === `-`;

src/model/cloud-runner/services/hooks/command-hook.ts

@@ -1,8 +1,8 @@
-import OrchestratorSecret from '../../options/orchestrator-secret';
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
 
 export class CommandHook {
   public commands: string[] = new Array<string>();
-  public secrets: OrchestratorSecret[] = new Array<OrchestratorSecret>();
+  public secrets: CloudRunnerSecret[] = new Array<CloudRunnerSecret>();
   public name!: string;
   public hook!: string[];
   public step!: string[];

src/model/cloud-runner/services/hooks/container-hook-service.ts

@@ -0,0 +1,265 @@
+import YAML from 'yaml';
+import CloudRunner from '../../cloud-runner';
+import { CustomWorkflow } from '../../workflows/custom-workflow';
+import { RemoteClientLogger } from '../../remote-client/remote-client-logger';
+import path from 'node:path';
+import fs from 'node:fs';
+import Input from '../../../input';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
+import { ContainerHook as ContainerHook } from './container-hook';
+import { CloudRunnerStepParameters } from '../../options/cloud-runner-step-parameters';
+
+export class ContainerHookService {
+  static GetContainerHooksFromFiles(hookLifecycle: string): ContainerHook[] {
+    const results: ContainerHook[] = [];
+    try {
+      const gameCiCustomStepsPath = path.join(process.cwd(), `game-ci`, `container-hooks`);
+      const files = fs.readdirSync(gameCiCustomStepsPath);
+      for (const file of files) {
+        if (!CloudRunnerOptions.containerHookFiles.includes(file.replace(`.yaml`, ``))) {
+          // RemoteClientLogger.log(`Skipping CustomStepFile: ${file}`);
+          continue;
+        }
+        const fileContents = fs.readFileSync(path.join(gameCiCustomStepsPath, file), `utf8`);
+        const fileContentsObject = ContainerHookService.ParseContainerHooks(fileContents)[0];
+        if (fileContentsObject.hook === hookLifecycle) {
+          results.push(fileContentsObject);
+        }
+      }
+    } catch (error) {
+      RemoteClientLogger.log(`Failed Getting: ${hookLifecycle} \n ${JSON.stringify(error, undefined, 4)}`);
+    }
+
+    // RemoteClientLogger.log(`Active Steps From Files: \n ${JSON.stringify(results, undefined, 4)}`);
+
+    const builtInContainerHooks: ContainerHook[] = ContainerHookService.ParseContainerHooks(
+      `- name: aws-s3-upload-build
+  image: amazon/aws-cli
+  hook: after
+  commands: |
+    aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
+    aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
+    aws configure set region $AWS_DEFAULT_REGION --profile default
+    aws s3 cp /data/cache/$CACHE_KEY/build/build-${CloudRunner.buildParameters.buildGuid}.tar${
+        CloudRunner.buildParameters.useCompressionStrategy ? '.lz4' : ''
+      } s3://${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/build/build-$BUILD_GUID.tar${
+        CloudRunner.buildParameters.useCompressionStrategy ? '.lz4' : ''
+      }
+    rm /data/cache/$CACHE_KEY/build/build-${CloudRunner.buildParameters.buildGuid}.tar${
+        CloudRunner.buildParameters.useCompressionStrategy ? '.lz4' : ''
+      }
+  secrets:
+  - name: awsAccessKeyId
+    value: ${process.env.AWS_ACCESS_KEY_ID || ``}
+  - name: awsSecretAccessKey
+    value: ${process.env.AWS_SECRET_ACCESS_KEY || ``}
+  - name: awsDefaultRegion
+    value: ${process.env.AWS_REGION || ``}
+- name: aws-s3-pull-build
+  image: amazon/aws-cli
+  commands: |
+    aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
+    aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
+    aws configure set region $AWS_DEFAULT_REGION --profile default
+    aws s3 ls ${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/ || true
+    aws s3 ls ${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/build || true
+    mkdir -p /data/cache/$CACHE_KEY/build/
+    aws s3 cp s3://${
+      CloudRunner.buildParameters.awsStackName
+    }/cloud-runner-cache/$CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${
+        CloudRunner.buildParameters.useCompressionStrategy ? '.lz4' : ''
+      } /data/cache/$CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${
+        CloudRunner.buildParameters.useCompressionStrategy ? '.lz4' : ''
+      }
+  secrets:
+    - name: AWS_ACCESS_KEY_ID
+    - name: AWS_SECRET_ACCESS_KEY
+    - name: AWS_DEFAULT_REGION
+    - name: BUILD_GUID_TARGET
+- name: steam-deploy-client
+  image: steamcmd/steamcmd
+  commands: |
+    apt-get update
+    apt-get install -y curl tar coreutils git tree > /dev/null
+    curl -s https://gist.githubusercontent.com/frostebite/1d56f5505b36b403b64193b7a6e54cdc/raw/fa6639ed4ef750c4268ea319d63aa80f52712ffb/deploy-client-steam.sh | bash
+  secrets:
+    - name: STEAM_USERNAME
+    - name: STEAM_PASSWORD
+    - name: STEAM_APPID
+    - name: STEAM_SSFN_FILE_NAME
+    - name: STEAM_SSFN_FILE_CONTENTS
+    - name: STEAM_CONFIG_VDF_1
+    - name: STEAM_CONFIG_VDF_2
+    - name: STEAM_CONFIG_VDF_3
+    - name: STEAM_CONFIG_VDF_4
+    - name: BUILD_GUID_TARGET
+    - name: RELEASE_BRANCH
+- name: steam-deploy-project
+  image: steamcmd/steamcmd
+  commands: |
+    apt-get update
+    apt-get install -y curl tar coreutils git tree > /dev/null
+    curl -s https://gist.githubusercontent.com/frostebite/969da6a41002a0e901174124b643709f/raw/02403e53fb292026cba81ddcf4ff35fc1eba111d/steam-deploy-project.sh | bash
+  secrets:
+    - name: STEAM_USERNAME
+    - name: STEAM_PASSWORD
+    - name: STEAM_APPID
+    - name: STEAM_SSFN_FILE_NAME
+    - name: STEAM_SSFN_FILE_CONTENTS
+    - name: STEAM_CONFIG_VDF_1
+    - name: STEAM_CONFIG_VDF_2
+    - name: STEAM_CONFIG_VDF_3
+    - name: STEAM_CONFIG_VDF_4
+    - name: BUILD_GUID_2
+    - name: RELEASE_BRANCH
+- name: aws-s3-upload-cache
+  image: amazon/aws-cli
+  hook: after
+  commands: |
+    aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
+    aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
+    aws configure set region $AWS_DEFAULT_REGION --profile default
+    aws s3 cp --recursive /data/cache/$CACHE_KEY/lfs s3://${
+      CloudRunner.buildParameters.awsStackName
+    }/cloud-runner-cache/$CACHE_KEY/lfs
+    rm -r /data/cache/$CACHE_KEY/lfs
+    aws s3 cp --recursive /data/cache/$CACHE_KEY/Library s3://${
+      CloudRunner.buildParameters.awsStackName
+    }/cloud-runner-cache/$CACHE_KEY/Library
+    rm -r /data/cache/$CACHE_KEY/Library
+  secrets:
+  - name: AWS_ACCESS_KEY_ID
+    value: ${process.env.AWS_ACCESS_KEY_ID || ``}
+  - name: AWS_SECRET_ACCESS_KEY
+    value: ${process.env.AWS_SECRET_ACCESS_KEY || ``}
+  - name: AWS_DEFAULT_REGION
+    value: ${process.env.AWS_REGION || ``}
+- name: aws-s3-pull-cache
+  image: amazon/aws-cli
+  hook: before
+  commands: |
+    aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
+    aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
+    aws configure set region $AWS_DEFAULT_REGION --profile default
+    mkdir -p /data/cache/$CACHE_KEY/Library/
+    mkdir -p /data/cache/$CACHE_KEY/lfs/
+    aws s3 ls ${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/ || true
+    aws s3 ls ${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/ || true
+    BUCKET1="${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/Library/"
+    aws s3 ls $BUCKET1 || true
+    OBJECT1="$(aws s3 ls $BUCKET1 | sort | tail -n 1 | awk '{print $4}' || '')"
+    aws s3 cp s3://$BUCKET1$OBJECT1 /data/cache/$CACHE_KEY/Library/ || true
+    BUCKET2="${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/$CACHE_KEY/lfs/"
+    aws s3 ls $BUCKET2 || true
+    OBJECT2="$(aws s3 ls $BUCKET2 | sort | tail -n 1 | awk '{print $4}' || '')"
+    aws s3 cp s3://$BUCKET2$OBJECT2 /data/cache/$CACHE_KEY/lfs/ || true
+  secrets:
+  - name: AWS_ACCESS_KEY_ID
+    value: ${process.env.AWS_ACCESS_KEY_ID || ``}
+  - name: AWS_SECRET_ACCESS_KEY
+    value: ${process.env.AWS_SECRET_ACCESS_KEY || ``}
+  - name: AWS_DEFAULT_REGION
+    value: ${process.env.AWS_REGION || ``}
+- name: debug-cache
+  image: ubuntu
+  hook: after
+  commands: |
+    apt-get update > /dev/null
+    ${CloudRunnerOptions.cloudRunnerDebug ? `apt-get install -y tree > /dev/null` : `#`}
+    ${CloudRunnerOptions.cloudRunnerDebug ? `tree -L 3 /data/cache` : `#`}
+  secrets:
+  - name: awsAccessKeyId
+    value: ${process.env.AWS_ACCESS_KEY_ID || ``}
+  - name: awsSecretAccessKey
+    value: ${process.env.AWS_SECRET_ACCESS_KEY || ``}
+  - name: awsDefaultRegion
+    value: ${process.env.AWS_REGION || ``}`,
+    ).filter((x) => CloudRunnerOptions.containerHookFiles.includes(x.name) && x.hook === hookLifecycle);
+    if (builtInContainerHooks.length > 0) {
+      results.push(...builtInContainerHooks);
+    }
+
+    return results;
+  }
+
+  private static ConvertYamlSecrets(object: ContainerHook) {
+    if (object.secrets === undefined) {
+      object.secrets = [];
+
+      return;
+    }
+    object.secrets = object.secrets.map((x: { [key: string]: any }) => {
+      return {
+        ParameterKey: x.name,
+        EnvironmentVariable: Input.ToEnvVarFormat(x.name),
+        ParameterValue: x.value,
+      };
+    });
+  }
+
+  public static ParseContainerHooks(steps: string): ContainerHook[] {
+    if (steps === '') {
+      return [];
+    }
+    const isArray = steps.replace(/\s/g, ``)[0] === `-`;
+    const object: ContainerHook[] = isArray ? YAML.parse(steps) : [YAML.parse(steps)];
+    for (const step of object) {
+      ContainerHookService.ConvertYamlSecrets(step);
+      if (step.secrets === undefined) {
+        step.secrets = [];
+      } else {
+        for (const secret of step.secrets) {
+          if (secret.ParameterValue === undefined && process.env[secret.EnvironmentVariable] !== undefined) {
+            if (CloudRunner.buildParameters?.cloudRunnerDebug) {
+              // CloudRunnerLogger.log(`Injecting custom step ${step.name} from env var ${secret.ParameterKey}`);
+            }
+            secret.ParameterValue = process.env[secret.ParameterKey] || ``;
+          }
+        }
+      }
+      if (step.image === undefined) {
+        step.image = `ubuntu`;
+      }
+    }
+    if (object === undefined) {
+      throw new Error(`Failed to parse ${steps}`);
+    }
+
+    return object;
+  }
+
+  static async RunPostBuildSteps(cloudRunnerStepState: CloudRunnerStepParameters) {
+    let output = ``;
+    const steps: ContainerHook[] = [
+      ...ContainerHookService.ParseContainerHooks(CloudRunner.buildParameters.postBuildContainerHooks),
+      ...ContainerHookService.GetContainerHooksFromFiles(`after`),
+    ];
+
+    if (steps.length > 0) {
+      output += await CustomWorkflow.runContainerJob(
+        steps,
+        cloudRunnerStepState.environment,
+        cloudRunnerStepState.secrets,
+      );
+    }
+
+    return output;
+  }
+  static async RunPreBuildSteps(cloudRunnerStepState: CloudRunnerStepParameters) {
+    let output = ``;
+    const steps: ContainerHook[] = [
+      ...ContainerHookService.ParseContainerHooks(CloudRunner.buildParameters.preBuildContainerHooks),
+      ...ContainerHookService.GetContainerHooksFromFiles(`before`),
+    ];
+
+    if (steps.length > 0) {
+      output += await CustomWorkflow.runContainerJob(
+        steps,
+        cloudRunnerStepState.environment,
+        cloudRunnerStepState.secrets,
+      );
+    }
+
+    return output;
+  }
+}

src/model/cloud-runner/services/hooks/container-hook.ts

@@ -0,0 +1,9 @@
+import CloudRunnerSecret from '../../options/cloud-runner-secret';
+
+export class ContainerHook {
+  public commands!: string;
+  public secrets: CloudRunnerSecret[] = new Array<CloudRunnerSecret>();
+  public name!: string;
+  public image: string = `ubuntu`;
+  public hook!: string;
+}

src/model/cloud-runner/services/utility/lfs-hashing.ts

@@ -1,20 +1,20 @@
 import path from 'node:path';
-import { OrchestratorFolders } from '../../options/orchestrator-folders';
+import { CloudRunnerFolders } from '../../options/cloud-runner-folders';
-import { OrchestratorSystem } from '../core/orchestrator-system';
+import { CloudRunnerSystem } from '../core/cloud-runner-system';
 import fs from 'node:fs';
 import { Cli } from '../../../cli/cli';
 import { CliFunction } from '../../../cli/cli-functions-repository';
 
 export class LfsHashing {
   public static async createLFSHashFiles() {
-    await OrchestratorSystem.Run(`git lfs ls-files -l | cut -d ' ' -f1 | sort > .lfs-assets-guid`);
+    await CloudRunnerSystem.Run(`git lfs ls-files -l | cut -d ' ' -f1 | sort > .lfs-assets-guid`);
-    await OrchestratorSystem.Run(`md5sum .lfs-assets-guid > .lfs-assets-guid-sum`);
+    await CloudRunnerSystem.Run(`md5sum .lfs-assets-guid > .lfs-assets-guid-sum`);
     const lfsHashes = {
       lfsGuid: fs
-        .readFileSync(`${path.join(OrchestratorFolders.repoPathAbsolute, `.lfs-assets-guid`)}`, 'utf8')
+        .readFileSync(`${path.join(CloudRunnerFolders.repoPathAbsolute, `.lfs-assets-guid`)}`, 'utf8')
         .replace(/\n/g, ``),
       lfsGuidSum: fs
-        .readFileSync(`${path.join(OrchestratorFolders.repoPathAbsolute, `.lfs-assets-guid-sum`)}`, 'utf8')
+        .readFileSync(`${path.join(CloudRunnerFolders.repoPathAbsolute, `.lfs-assets-guid-sum`)}`, 'utf8')
         .replace('  .lfs-assets-guid', '')
         .replace(/\n/g, ``),
     };
@@ -24,7 +24,7 @@ export class LfsHashing {
   public static async hashAllFiles(folder: string) {
     const startPath = process.cwd();
     process.chdir(folder);
-    const result = await (await OrchestratorSystem.Run(`find -type f -exec md5sum "{}" + | sort | md5sum`))
+    const result = await (await CloudRunnerSystem.Run(`find -type f -exec md5sum "{}" + | sort | md5sum`))
       .replace(/\n/g, '')
       .split(` `)[0];
     process.chdir(startPath);

src/model/cloud-runner/tests/cloud-runner-async-workflow.test.ts

@@ -1,9 +1,9 @@
 import { BuildParameters, ImageTag } from '../..';
-import Orchestrator from '../orchestrator';
+import CloudRunner from '../cloud-runner';
 import UnityVersioning from '../../unity-versioning';
 import { Cli } from '../../cli/cli';
-import OrchestratorOptions from '../options/orchestrator-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
-import setups from './orchestrator-suite.test';
+import setups from './cloud-runner-suite.test';
 import { OptionValues } from 'commander';
 
 async function CreateParameters(overrides: OptionValues | undefined) {
@@ -11,18 +11,18 @@ async function CreateParameters(overrides: OptionValues | undefined) {
 
   return BuildParameters.create();
 }
-describe('Orchestrator Async Workflows', () => {
+describe('Cloud Runner Async Workflows', () => {
   setups();
   it('Responds', () => {});
 
-  if (OrchestratorOptions.orchestratorDebug && OrchestratorOptions.providerStrategy !== `local-docker`) {
+  if (CloudRunnerOptions.cloudRunnerDebug && CloudRunnerOptions.providerStrategy !== `local-docker`) {
     it('Async Workflows', async () => {
       // Setup parameters
       const buildParameter = await CreateParameters({
         versioning: 'None',
         projectPath: 'test-project',
         unityVersion: UnityVersioning.read('test-project'),
-        asyncOrchestrator: `true`,
+        asyncCloudRunner: `true`,
         githubChecks: `true`,
         providerStrategy: 'k8s',
         buildPlatform: 'linux',
@@ -31,7 +31,7 @@ describe('Orchestrator Async Workflows', () => {
       const baseImage = new ImageTag(buildParameter);
 
       // Run the job
-      await Orchestrator.run(buildParameter, baseImage.toString());
+      await CloudRunner.run(buildParameter, baseImage.toString());
 
       // wait for 15 seconds
       await new Promise((resolve) => setTimeout(resolve, 1000 * 60 * 12));

src/model/cloud-runner/tests/cloud-runner-caching.test.ts

@@ -3,15 +3,15 @@ import path from 'node:path';
 import BuildParameters from '../../build-parameters';
 import { Cli } from '../../cli/cli';
 import UnityVersioning from '../../unity-versioning';
-import Orchestrator from '../orchestrator';
+import CloudRunner from '../cloud-runner';
-import { OrchestratorSystem } from '../services/core/orchestrator-system';
+import { CloudRunnerSystem } from '../services/core/cloud-runner-system';
 import { Caching } from '../remote-client/caching';
 import { v4 as uuidv4 } from 'uuid';
 import GitHub from '../../github';
-import OrchestratorOptions from '../options/orchestrator-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
-describe('Orchestrator (Remote Client) Caching', () => {
+describe('Cloud Runner (Remote Client) Caching', () => {
   it('responds', () => {});
-  if (OrchestratorOptions.providerStrategy === `local-docker`) {
+  if (CloudRunnerOptions.providerStrategy === `local-docker`) {
     it('Simple caching works', async () => {
       Cli.options = {
         versioning: 'None',
@@ -22,7 +22,7 @@ describe('Orchestrator (Remote Client) Caching', () => {
       };
       GitHub.githubInputEnabled = false;
       const buildParameter = await BuildParameters.create();
-      Orchestrator.buildParameters = buildParameter;
+      CloudRunner.buildParameters = buildParameter;
 
       // Create test folder
       const testFolder = path.resolve(__dirname, Cli.options.cacheKey);
@@ -43,7 +43,7 @@ describe('Orchestrator (Remote Client) Caching', () => {
         testFolder.replace(/\\/g, `/`),
         `${Cli.options.cacheKey}`,
       );
-      await OrchestratorSystem.Run(`du -h ${__dirname}`);
+      await CloudRunnerSystem.Run(`du -h ${__dirname}`);
 
       // Compare validity to original hash
       expect(fs.readFileSync(path.resolve(testFolder, 'test.txt'), { encoding: 'utf8' }).toString()).toContain(

src/model/cloud-runner/tests/cloud-runner-environment.test.ts

@@ -1,12 +1,12 @@
-import { BuildParameters, Orchestrator, ImageTag, Input } from '../..';
+import { BuildParameters, CloudRunner, ImageTag, Input } from '../..';
 import { TaskParameterSerializer } from '../services/core/task-parameter-serializer';
 import UnityVersioning from '../../unity-versioning';
 import { Cli } from '../../cli/cli';
 import GitHub from '../../github';
-import setups from './orchestrator-suite.test';
+import setups from './cloud-runner-suite.test';
-import { OrchestratorStatics } from '../options/orchestrator-statics';
+import { CloudRunnerStatics } from '../options/cloud-runner-statics';
-import OrchestratorOptions from '../options/orchestrator-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
-import OrchestratorLogger from '../services/core/orchestrator-logger';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
 
 async function CreateParameters(overrides: any) {
   if (overrides) {
@@ -21,14 +21,14 @@ async function CreateParameters(overrides: any) {
   return results;
 }
 
-describe('Orchestrator Sync Environments', () => {
+describe('Cloud Runner Sync Environments', () => {
   setups();
   const testSecretName = 'testSecretName';
   const testSecretValue = 'testSecretValue';
   it('Responds', () => {});
 
-  if (OrchestratorOptions.orchestratorDebug) {
+  if (CloudRunnerOptions.cloudRunnerDebug) {
-    it('All build parameters sent to orchestrator as env vars', async () => {
+    it('All build parameters sent to cloud runner as env vars', async () => {
       // Setup parameters
       const buildParameter = await CreateParameters({
         versioning: 'None',
@@ -43,7 +43,6 @@ describe('Orchestrator Sync Environments', () => {
             - name: '${testSecretName}'
               value: '${testSecretValue}'
         `,
-        orchestratorDebug: true,
       });
       const baseImage = new ImageTag(buildParameter);
       if (baseImage.toString().includes('undefined')) {
@@ -51,49 +50,23 @@ describe('Orchestrator Sync Environments', () => {
       }
 
       // Run the job
-      const file = (await Orchestrator.run(buildParameter, baseImage.toString())).BuildResults;
+      const file = (await CloudRunner.run(buildParameter, baseImage.toString())).BuildResults;
 
       // Assert results
       // expect(file).toContain(JSON.stringify(buildParameter));
       expect(file).toContain(`${Input.ToEnvVarFormat(testSecretName)}=${testSecretValue}`);
-      const environmentVariables = TaskParameterSerializer.createOrchestratorEnvironmentVariables(buildParameter);
+      const environmentVariables = TaskParameterSerializer.createCloudRunnerEnvironmentVariables(buildParameter);
       const secrets = TaskParameterSerializer.readDefaultSecrets().map((x) => {
         return {
           name: x.EnvironmentVariable,
           value: x.ParameterValue,
         };
       });
-
-      // Apply the same localhost -> host.docker.internal replacement that the Docker provider does
-      // This ensures the test expectations match what's actually in the output
-      const endpointEnvironmentNames = new Set([
-        'AWS_S3_ENDPOINT',
-        'AWS_ENDPOINT',
-        'AWS_CLOUD_FORMATION_ENDPOINT',
-        'AWS_ECS_ENDPOINT',
-        'AWS_KINESIS_ENDPOINT',
-        'AWS_CLOUD_WATCH_LOGS_ENDPOINT',
-        'INPUT_AWSS3ENDPOINT',
-        'INPUT_AWSENDPOINT',
-      ]);
       const combined = [...environmentVariables, ...secrets]
         .filter((element) => element.value !== undefined && element.value !== '' && typeof element.value !== 'function')
         .map((x) => {
           if (typeof x.value === `string`) {
             x.value = x.value.replace(/\s+/g, '');
-
-            // Apply localhost -> host.docker.internal replacement for LocalStack endpoints
-            // when using local-docker or aws provider (which uses Docker)
-            if (
-              endpointEnvironmentNames.has(x.name) &&
-              (x.value.startsWith('http://localhost') || x.value.startsWith('http://127.0.0.1')) &&
-              (OrchestratorOptions.providerStrategy === 'local-docker' ||
-                OrchestratorOptions.providerStrategy === 'aws')
-            ) {
-              x.value = x.value
-                .replace('http://localhost', 'http://host.docker.internal')
-                .replace('http://127.0.0.1', 'http://host.docker.internal');
-            }
           }
 
           return x;
@@ -103,10 +76,10 @@ describe('Orchestrator Sync Environments', () => {
         });
       const newLinePurgedFile = file
         .replace(/\s+/g, '')
-        .replace(new RegExp(`\\[${OrchestratorStatics.logPrefix}\\]`, 'g'), '');
+        .replace(new RegExp(`\\[${CloudRunnerStatics.logPrefix}\\]`, 'g'), '');
       for (const element of combined) {
         expect(newLinePurgedFile).toContain(`${element.name}`);
-        OrchestratorLogger.log(`Contains ${element.name}`);
+        CloudRunnerLogger.log(`Contains ${element.name}`);
         const fullNameEqualValue = `${element.name}=${element.value}`;
         expect(newLinePurgedFile).toContain(fullNameEqualValue);
       }
@@ -114,11 +87,11 @@ describe('Orchestrator Sync Environments', () => {
   }
 });
 
-describe('Orchestrator Environment Serializer', () => {
+describe('Cloud Runner Environment Serializer', () => {
   setups();
   const testSecretName = 'testSecretName';
   const testSecretValue = 'testSecretValue';
-  it('Orchestrator Parameter Serialization', async () => {
+  it('Cloud Runner Parameter Serialization', async () => {
     // Setup parameters
     const buildParameter = await CreateParameters({
       versioning: 'None',
@@ -134,9 +107,9 @@ describe('Orchestrator Environment Serializer', () => {
       `,
     });
 
-    const result = TaskParameterSerializer.createOrchestratorEnvironmentVariables(buildParameter);
+    const result = TaskParameterSerializer.createCloudRunnerEnvironmentVariables(buildParameter);
     expect(result.find((x) => Number.parseInt(x.name)) !== undefined).toBeFalsy();
-    const result2 = TaskParameterSerializer.createOrchestratorEnvironmentVariables(buildParameter);
+    const result2 = TaskParameterSerializer.createCloudRunnerEnvironmentVariables(buildParameter);
     expect(result2.find((x) => Number.parseInt(x.name)) !== undefined).toBeFalsy();
   });
 });

src/model/cloud-runner/tests/cloud-runner-github-checks.test.ts

@@ -0,0 +1,59 @@
+import { BuildParameters } from '../..';
+import CloudRunner from '../cloud-runner';
+import UnityVersioning from '../../unity-versioning';
+import { Cli } from '../../cli/cli';
+import CloudRunnerOptions from '../options/cloud-runner-options';
+import setups from './cloud-runner-suite.test';
+import { OptionValues } from 'commander';
+import GitHub from '../../github';
+export const TIMEOUT_INFINITE = 1e9;
+async function CreateParameters(overrides: OptionValues | undefined) {
+  if (overrides) Cli.options = overrides;
+
+  return BuildParameters.create();
+}
+describe('Cloud Runner Github Checks', () => {
+  setups();
+  it('Responds', () => {});
+
+  if (CloudRunnerOptions.cloudRunnerDebug) {
+    it(
+      'Check Handling Direct',
+      async () => {
+        // Setup parameters
+        const buildParameter = await CreateParameters({
+          versioning: 'None',
+          projectPath: 'test-project',
+          unityVersion: UnityVersioning.read('test-project'),
+          asyncCloudRunner: `true`,
+          githubChecks: `true`,
+        });
+        await CloudRunner.setup(buildParameter);
+        CloudRunner.buildParameters.githubCheckId = await GitHub.createGitHubCheck(`direct create`);
+        await GitHub.updateGitHubCheck(`1 ${new Date().toISOString()}`, `direct`);
+        await GitHub.updateGitHubCheck(`2 ${new Date().toISOString()}`, `direct`, `success`, `completed`);
+      },
+      TIMEOUT_INFINITE,
+    );
+    it(
+      'Check Handling Via Async Workflow',
+      async () => {
+        // Setup parameters
+        const buildParameter = await CreateParameters({
+          versioning: 'None',
+          projectPath: 'test-project',
+          unityVersion: UnityVersioning.read('test-project'),
+          asyncCloudRunner: `true`,
+          githubChecks: `true`,
+        });
+        GitHub.forceAsyncTest = true;
+        await CloudRunner.setup(buildParameter);
+        CloudRunner.buildParameters.githubCheckId = await GitHub.createGitHubCheck(`async create`);
+        await GitHub.updateGitHubCheck(`1 ${new Date().toISOString()}`, `async`);
+        await GitHub.updateGitHubCheck(`2 ${new Date().toISOString()}`, `async`, `success`, `completed`);
+        GitHub.forceAsyncTest = false;
+      },
+      TIMEOUT_INFINITE,
+    );
+  }
+});

src/model/cloud-runner/tests/cloud-runner-hooks.test.ts

@@ -1,11 +1,11 @@
-import Orchestrator from '../orchestrator';
+import CloudRunner from '../cloud-runner';
 import { BuildParameters, ImageTag } from '../..';
 import UnityVersioning from '../../unity-versioning';
 import { Cli } from '../../cli/cli';
-import OrchestratorLogger from '../services/core/orchestrator-logger';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
 import { v4 as uuidv4 } from 'uuid';
-import OrchestratorOptions from '../options/orchestrator-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
-import setups from './orchestrator-suite.test';
+import setups from './cloud-runner-suite.test';
 import { ContainerHookService } from '../services/hooks/container-hook-service';
 import { CommandHookService } from '../services/hooks/command-hook-service';
 
@@ -17,7 +17,7 @@ async function CreateParameters(overrides: any) {
   return await BuildParameters.create();
 }
 
-describe('Orchestrator Custom Hooks And Steps', () => {
+describe('Cloud Runner Custom Hooks And Steps', () => {
   it('Responds', () => {});
   setups();
   it('Check parsing and reading of steps', async () => {
@@ -33,12 +33,12 @@ commands: echo "test"`;
       image: 'ubuntu',
       cacheKey: `test-case-${uuidv4()}`,
     };
-    Orchestrator.setup(await CreateParameters(overrides));
+    CloudRunner.setup(await CreateParameters(overrides));
     const stringObject = ContainerHookService.ParseContainerHooks(yamlString);
     const stringObject2 = ContainerHookService.ParseContainerHooks(yamlString2);
 
-    OrchestratorLogger.log(yamlString);
+    CloudRunnerLogger.log(yamlString);
-    OrchestratorLogger.log(JSON.stringify(stringObject, undefined, 4));
+    CloudRunnerLogger.log(JSON.stringify(stringObject, undefined, 4));
 
     expect(stringObject.length).toBe(1);
     expect(stringObject[0].hook).toBe(`before`);
@@ -46,9 +46,9 @@ commands: echo "test"`;
     expect(stringObject2[0].hook).toBe(`before`);
 
     const getCustomStepsFromFiles = ContainerHookService.GetContainerHooksFromFiles(`before`);
-    OrchestratorLogger.log(JSON.stringify(getCustomStepsFromFiles, undefined, 4));
+    CloudRunnerLogger.log(JSON.stringify(getCustomStepsFromFiles, undefined, 4));
   });
-  if (OrchestratorOptions.orchestratorDebug) {
+  if (CloudRunnerOptions.cloudRunnerDebug && CloudRunnerOptions.providerStrategy !== `k8s`) {
     it('Should be 1 before and 1 after hook', async () => {
       const overrides = {
         versioning: 'None',
@@ -61,7 +61,7 @@ commands: echo "test"`;
         commandHookFiles: `my-test-hook-pre-build,my-test-hook-post-build`,
       };
       const buildParameter2 = await CreateParameters(overrides);
-      await Orchestrator.setup(buildParameter2);
+      await CloudRunner.setup(buildParameter2);
       const beforeHooks = CommandHookService.GetCustomHooksFromFiles(`before`);
       const afterHooks = CommandHookService.GetCustomHooksFromFiles(`after`);
       expect(beforeHooks).toHaveLength(1);
@@ -79,7 +79,7 @@ commands: echo "test"`;
         commandHookFiles: `my-test-hook-pre-build,my-test-hook-post-build`,
       };
       const buildParameter2 = await CreateParameters(overrides);
-      await Orchestrator.setup(buildParameter2);
+      await CloudRunner.setup(buildParameter2);
       const beforeSteps = ContainerHookService.GetContainerHooksFromFiles(`before`);
       const afterSteps = ContainerHookService.GetContainerHooksFromFiles(`after`);
       expect(beforeSteps).toHaveLength(1);
@@ -94,29 +94,21 @@ commands: echo "test"`;
         cacheKey: `test-case-${uuidv4()}`,
         containerHookFiles: `my-test-step-pre-build,my-test-step-post-build`,
         commandHookFiles: `my-test-hook-pre-build,my-test-hook-post-build`,
-        orchestratorDebug: true,
       };
       const buildParameter2 = await CreateParameters(overrides);
       const baseImage2 = new ImageTag(buildParameter2);
-      const results2Object = await Orchestrator.run(buildParameter2, baseImage2.toString());
+      const results2Object = await CloudRunner.run(buildParameter2, baseImage2.toString());
       const results2 = results2Object.BuildResults;
-      OrchestratorLogger.log(`run 2 succeeded`);
+      CloudRunnerLogger.log(`run 2 succeeded`);
 
       const buildContainsBuildSucceeded = results2.includes('Build succeeded');
-      const buildContainsPreBuildHookRunMessage = results2.includes('before-build hook test!!');
+      const buildContainsPreBuildHookRunMessage = results2.includes('before-build hook test!');
       const buildContainsPostBuildHookRunMessage = results2.includes('after-build hook test!');
 
       const buildContainsPreBuildStepMessage = results2.includes('before-build step test!');
       const buildContainsPostBuildStepMessage = results2.includes('after-build step test!');
 
-      // Skip "Build succeeded" check for local-docker and aws when using ubuntu image (Unity doesn't run)
+      expect(buildContainsBuildSucceeded).toBeTruthy();
-      if (
-        OrchestratorOptions.providerStrategy !== 'local' &&
-        OrchestratorOptions.providerStrategy !== 'local-docker' &&
-        OrchestratorOptions.providerStrategy !== 'aws'
-      ) {
-        expect(buildContainsBuildSucceeded).toBeTruthy();
-      }
       expect(buildContainsPreBuildHookRunMessage).toBeTruthy();
       expect(buildContainsPostBuildHookRunMessage).toBeTruthy();
       expect(buildContainsPreBuildStepMessage).toBeTruthy();

src/model/cloud-runner/tests/cloud-runner-image.test.ts

@@ -2,7 +2,7 @@ import { BuildParameters, ImageTag } from '../..';
 import UnityVersioning from '../../unity-versioning';
 import { Cli } from '../../cli/cli';
 import GitHub from '../../github';
-import setups from './orchestrator-suite.test';
+import setups from './cloud-runner-suite.test';
 
 async function CreateParameters(overrides: any) {
   if (overrides) {
@@ -17,7 +17,7 @@ async function CreateParameters(overrides: any) {
   return results;
 }
 
-describe('Orchestrator Image', () => {
+describe('Cloud Runner Image', () => {
   setups();
   const testSecretName = 'testSecretName';
   const testSecretValue = 'testSecretValue';

src/model/cloud-runner/tests/cloud-runner-local-persistence.test.ts

@@ -1,17 +1,17 @@
 import { ImageTag } from '../..';
-import Orchestrator from '../orchestrator';
+import CloudRunner from '../cloud-runner';
 import UnityVersioning from '../../unity-versioning';
-import OrchestratorOptions from '../options/orchestrator-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
-import setups from './orchestrator-suite.test';
+import setups from './cloud-runner-suite.test';
 import fs from 'node:fs';
 import { CreateParameters } from './create-test-parameter';
-import OrchestratorLogger from '../services/core/orchestrator-logger';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
 
-describe('Orchestrator Local Docker Workflows', () => {
+describe('Cloud Runner Local Docker Workflows', () => {
   setups();
   it('Responds', () => {});
 
-  if (OrchestratorOptions.providerStrategy === `local-docker`) {
+  if (CloudRunnerOptions.providerStrategy === `local-docker`) {
     it('inspect stateful folder of workflows', async () => {
       const testValue = `the state in a job exits in the expected local-docker folder`;
 
@@ -39,15 +39,15 @@ describe('Orchestrator Local Docker Workflows', () => {
       const baseImage = new ImageTag(buildParameter);
 
       // Run the job
-      await Orchestrator.run(buildParameter, baseImage.toString());
+      await CloudRunner.run(buildParameter, baseImage.toString());
-      await Orchestrator.run(buildParameter2, baseImage.toString());
+      await CloudRunner.run(buildParameter2, baseImage.toString());
 
-      const outputFile = fs.readFileSync(`./orchestrator-cache/test-out-state.txt`, `utf-8`);
+      const outputFile = fs.readFileSync(`./cloud-runner-cache/test-out-state.txt`, `utf-8`);
       expect(outputFile).toMatch(testValue);
 
-      const outputFile2 = fs.readFileSync(`./orchestrator-cache/test-out-state-2.txt`, `utf-8`);
+      const outputFile2 = fs.readFileSync(`./cloud-runner-cache/test-out-state-2.txt`, `utf-8`);
       expect(outputFile2).toMatch(testValue);
-      OrchestratorLogger.log(outputFile);
+      CloudRunnerLogger.log(outputFile);
     }, 1_000_000_000);
   }
 });

src/model/cloud-runner/tests/cloud-runner-locking-core.test.ts

@@ -1,12 +1,12 @@
 import SharedWorkspaceLocking from '../services/core/shared-workspace-locking';
 import { Cli } from '../../cli/cli';
-import setups from './orchestrator-suite.test';
+import setups from './cloud-runner-suite.test';
-import OrchestratorLogger from '../services/core/orchestrator-logger';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
 import { v4 as uuidv4 } from 'uuid';
-import OrchestratorOptions from '../options/orchestrator-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
 import UnityVersioning from '../../unity-versioning';
 import BuildParameters from '../../build-parameters';
-import Orchestrator from '../orchestrator';
+import CloudRunner from '../cloud-runner';
 
 async function CreateParameters(overrides: any) {
   if (overrides) {
@@ -16,10 +16,10 @@ async function CreateParameters(overrides: any) {
   return await BuildParameters.create();
 }
 
-describe('Orchestrator Locking Core', () => {
+describe('Cloud Runner Locking Core', () => {
   setups();
   it('Responds', () => {});
-  if (OrchestratorOptions.orchestratorDebug) {
+  if (CloudRunnerOptions.cloudRunnerDebug) {
     it(`Create Workspace`, async () => {
       const overrides: any = {
         versioning: 'None',
@@ -30,7 +30,7 @@ describe('Orchestrator Locking Core', () => {
         maxRetainedWorkspaces: 3,
       };
       const buildParameters = await CreateParameters(overrides);
-      Orchestrator.buildParameters = buildParameters;
+      CloudRunner.buildParameters = buildParameters;
       const newWorkspaceName = `test-workspace-${uuidv4()}`;
       expect(await SharedWorkspaceLocking.CreateWorkspace(newWorkspaceName, buildParameters)).toBeTruthy();
     }, 150000);
@@ -45,7 +45,7 @@ describe('Orchestrator Locking Core', () => {
       };
       const runId = uuidv4();
       const buildParameters = await CreateParameters(overrides);
-      Orchestrator.buildParameters = buildParameters;
+      CloudRunner.buildParameters = buildParameters;
       const newWorkspaceName = `test-workspace-${uuidv4()}`;
       expect(await SharedWorkspaceLocking.CreateWorkspace(newWorkspaceName, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.LockWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
@@ -63,7 +63,7 @@ describe('Orchestrator Locking Core', () => {
 
       const newWorkspaceName = `test-workspace-${uuidv4()}`;
       const runId = uuidv4();
-      Orchestrator.buildParameters = buildParameters;
+      CloudRunner.buildParameters = buildParameters;
       expect(await SharedWorkspaceLocking.CreateWorkspace(newWorkspaceName, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.LockWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.HasWorkspaceLock(newWorkspaceName, runId, buildParameters)).toBeTruthy();
@@ -97,7 +97,7 @@ describe('Orchestrator Locking Core', () => {
         await new Promise((promise) => setTimeout(promise, 1500));
         const isLocked = await SharedWorkspaceLocking.IsWorkspaceLocked(element, buildParameters);
         const isBelowMax = await SharedWorkspaceLocking.IsWorkspaceBelowMax(element, buildParameters);
-        OrchestratorLogger.log(`workspace ${element} locked:${isLocked} below max:${isBelowMax}`);
+        CloudRunnerLogger.log(`workspace ${element} locked:${isLocked} below max:${isBelowMax}`);
         const lock = files.find((x) => {
           return x.endsWith(`_lock`);
         });

src/model/cloud-runner/tests/cloud-runner-locking-get-locked.test.ts

@@ -1,11 +1,11 @@
 import SharedWorkspaceLocking from '../services/core/shared-workspace-locking';
 import { Cli } from '../../cli/cli';
-import setups from './orchestrator-suite.test';
+import setups from './cloud-runner-suite.test';
 import { v4 as uuidv4 } from 'uuid';
-import OrchestratorOptions from '../options/orchestrator-options';
+import CloudRunnerOptions from '../options/cloud-runner-options';
 import UnityVersioning from '../../unity-versioning';
 import BuildParameters from '../../build-parameters';
-import Orchestrator from '../orchestrator';
+import CloudRunner from '../cloud-runner';
 
 async function CreateParameters(overrides: any) {
   if (overrides) {
@@ -15,10 +15,10 @@ async function CreateParameters(overrides: any) {
   return await BuildParameters.create();
 }
 
-describe('Orchestrator Locking Get Locked Workspace', () => {
+describe('Cloud Runner Locking Get Locked Workspace', () => {
   setups();
   it('Responds', () => {});
-  if (OrchestratorOptions.orchestratorDebug) {
+  if (CloudRunnerOptions.cloudRunnerDebug) {
     it(`Get locked workspace From No Workspace`, async () => {
       const overrides: any = {
         versioning: 'None',
@@ -32,7 +32,7 @@ describe('Orchestrator Locking Get Locked Workspace', () => {
 
       const newWorkspaceName = `test-workspace-${uuidv4()}`;
       const runId = uuidv4();
-      Orchestrator.buildParameters = buildParameters;
+      CloudRunner.buildParameters = buildParameters;
       expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
     }, 150000);
     it(`Get locked workspace from unlocked`, async () => {
@@ -48,10 +48,10 @@ describe('Orchestrator Locking Get Locked Workspace', () => {
 
       const newWorkspaceName = `test-workspace-${uuidv4()}`;
       const runId = uuidv4();
-      Orchestrator.buildParameters = buildParameters;
+      CloudRunner.buildParameters = buildParameters;
       expect(await SharedWorkspaceLocking.CreateWorkspace(newWorkspaceName, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
-      expect(Orchestrator.lockedWorkspace).toMatch(newWorkspaceName);
+      expect(CloudRunner.lockedWorkspace).toMatch(newWorkspaceName);
     }, 300000);
     it(`Get locked workspace from locked`, async () => {
       const overrides: any = {
@@ -67,7 +67,7 @@ describe('Orchestrator Locking Get Locked Workspace', () => {
       const newWorkspaceName = `test-workspace-${uuidv4()}`;
       const runId = uuidv4();
       const runId2 = uuidv4();
-      Orchestrator.buildParameters = buildParameters;
+      CloudRunner.buildParameters = buildParameters;
       expect(await SharedWorkspaceLocking.CreateWorkspace(newWorkspaceName, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.LockWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.HasWorkspaceLock(newWorkspaceName, runId, buildParameters)).toBeTruthy();
@@ -75,7 +75,7 @@ describe('Orchestrator Locking Get Locked Workspace', () => {
       expect(await SharedWorkspaceLocking.IsWorkspaceBelowMax(newWorkspaceName, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.DoesWorkspaceExist(newWorkspaceName, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId2, buildParameters)).toBeTruthy();
-      expect(Orchestrator.lockedWorkspace).not.toMatch(newWorkspaceName);
+      expect(CloudRunner.lockedWorkspace).not.toMatch(newWorkspaceName);
     }, 300000);
     it(`Get locked workspace after double lock and one unlock`, async () => {
       const overrides: any = {
@@ -91,7 +91,7 @@ describe('Orchestrator Locking Get Locked Workspace', () => {
       const newWorkspaceName = `test-workspace-${uuidv4()}`;
       const runId = uuidv4();
       const runId2 = uuidv4();
-      Orchestrator.buildParameters = buildParameters;
+      CloudRunner.buildParameters = buildParameters;
       expect(await SharedWorkspaceLocking.CreateWorkspace(newWorkspaceName, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.LockWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)).toBeTruthy();
@@ -102,7 +102,7 @@ describe('Orchestrator Locking Get Locked Workspace', () => {
       expect(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.DoesWorkspaceExist(newWorkspaceName, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId2, buildParameters)).toBeTruthy();
-      expect(Orchestrator.lockedWorkspace).not.toContain(newWorkspaceName);
+      expect(CloudRunner.lockedWorkspace).not.toContain(newWorkspaceName);
     }, 300000);
     it(`Get locked workspace after double lock and unlock`, async () => {
       const overrides: any = {
@@ -118,7 +118,7 @@ describe('Orchestrator Locking Get Locked Workspace', () => {
       const newWorkspaceName = `test-workspace-${uuidv4()}`;
       const runId = uuidv4();
       const runId2 = uuidv4();
-      Orchestrator.buildParameters = buildParameters;
+      CloudRunner.buildParameters = buildParameters;
       expect(await SharedWorkspaceLocking.CreateWorkspace(newWorkspaceName, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.LockWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)).toBeTruthy();
@@ -130,7 +130,7 @@ describe('Orchestrator Locking Get Locked Workspace', () => {
       expect(await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)).toBeFalsy();
       expect(await SharedWorkspaceLocking.DoesWorkspaceExist(newWorkspaceName, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId2, buildParameters)).toBeTruthy();
-      expect(Orchestrator.lockedWorkspace).toContain(newWorkspaceName);
+      expect(CloudRunner.lockedWorkspace).toContain(newWorkspaceName);
     }, 300000);
     it(`Get locked workspace from unlocked was locked`, async () => {
       const overrides: any = {
@@ -145,12 +145,12 @@ describe('Orchestrator Locking Get Locked Workspace', () => {
 
       const newWorkspaceName = `test-workspace-${uuidv4()}`;
       const runId = uuidv4();
-      Orchestrator.buildParameters = buildParameters;
+      CloudRunner.buildParameters = buildParameters;
       expect(await SharedWorkspaceLocking.CreateWorkspace(newWorkspaceName, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.LockWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.ReleaseWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
-      expect(Orchestrator.lockedWorkspace).toMatch(newWorkspaceName);
+      expect(CloudRunner.lockedWorkspace).toMatch(newWorkspaceName);
     }, 300000);
   }
 });

src/model/cloud-runner/tests/cloud-runner-s3-steps.test.ts

@@ -0,0 +1,48 @@
+import CloudRunner from '../cloud-runner';
+import { BuildParameters, ImageTag } from '../..';
+import UnityVersioning from '../../unity-versioning';
+import { Cli } from '../../cli/cli';
+import CloudRunnerLogger from '../services/core/cloud-runner-logger';
+import { v4 as uuidv4 } from 'uuid';
+import CloudRunnerOptions from '../options/cloud-runner-options';
+import setups from './cloud-runner-suite.test';
+import { CloudRunnerSystem } from '../services/core/cloud-runner-system';
+import { OptionValues } from 'commander';
+
+async function CreateParameters(overrides: OptionValues | undefined) {
+  if (overrides) {
+    Cli.options = overrides;
+  }
+
+  return await BuildParameters.create();
+}
+
+describe('Cloud Runner pre-built S3 steps', () => {
+  it('Responds', () => {});
+  setups();
+  if (CloudRunnerOptions.cloudRunnerDebug && CloudRunnerOptions.providerStrategy !== `local-docker`) {
+    it('Run build and prebuilt s3 cache pull, cache push and upload build', async () => {
+      const overrides = {
+        versioning: 'None',
+        projectPath: 'test-project',
+        unityVersion: UnityVersioning.determineUnityVersion('test-project', UnityVersioning.read('test-project')),
+        targetPlatform: 'StandaloneLinux64',
+        cacheKey: `test-case-${uuidv4()}`,
+        containerHookFiles: `aws-s3-pull-cache,aws-s3-upload-cache,aws-s3-upload-build`,
+      };
+      const buildParameter2 = await CreateParameters(overrides);
+      const baseImage2 = new ImageTag(buildParameter2);
+      const results2Object = await CloudRunner.run(buildParameter2, baseImage2.toString());
+      const results2 = results2Object.BuildResults;
+      CloudRunnerLogger.log(`run 2 succeeded`);
+
+      const build2ContainsBuildSucceeded = results2.includes('Build succeeded');
+      expect(build2ContainsBuildSucceeded).toBeTruthy();
+
+      const results = await CloudRunnerSystem.RunAndReadLines(
+        `aws s3 ls s3://${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/`,
+      );
+      CloudRunnerLogger.log(results.join(`,`));
+    }, 1_000_000_000);
+  }
+});

src/model/cloud-runner/tests/cloud-runner-suite.test.ts

@@ -1,7 +1,7 @@
 import { Cli } from '../../cli/cli';
 import GitHub from '../../github';
 
-describe('Orchestrator', () => {
+describe('Cloud Runner', () => {
   it('Responds', () => {});
 });
 

src/model/cloud-runner/tests/e2e/cloud-runner-end2end-caching.test.ts

@@ -0,0 +1,92 @@
+import CloudRunner from '../../cloud-runner';
+import { BuildParameters, ImageTag } from '../../..';
+import UnityVersioning from '../../../unity-versioning';
+import { Cli } from '../../../cli/cli';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
+import { v4 as uuidv4 } from 'uuid';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
+import setups from '../cloud-runner-suite.test';
+import * as fs from 'node:fs';
+import { CloudRunnerSystem } from '../../services/core/cloud-runner-system';
+
+async function CreateParameters(overrides: any) {
+  if (overrides) {
+    Cli.options = overrides;
+  }
+
+  return await BuildParameters.create();
+}
+
+describe('Cloud Runner Caching', () => {
+  it('Responds', () => {});
+  setups();
+  if (CloudRunnerOptions.cloudRunnerDebug) {
+    it('Run one build it should not use cache, run subsequent build which should use cache', async () => {
+      const overrides = {
+        versioning: 'None',
+        image: 'ubuntu',
+        projectPath: 'test-project',
+        unityVersion: UnityVersioning.determineUnityVersion('test-project', UnityVersioning.read('test-project')),
+        targetPlatform: 'StandaloneLinux64',
+        cacheKey: `test-case-${uuidv4()}`,
+        containerHookFiles: `debug-cache`,
+        cloudRunnerBranch: `cloud-runner-develop`,
+      };
+      if (CloudRunnerOptions.providerStrategy === `k8s`) {
+        overrides.containerHookFiles += `,aws-s3-pull-cache,aws-s3-upload-cache`;
+      }
+      const buildParameter = await CreateParameters(overrides);
+      expect(buildParameter.projectPath).toEqual(overrides.projectPath);
+
+      const baseImage = new ImageTag(buildParameter);
+      const resultsObject = await CloudRunner.run(buildParameter, baseImage.toString());
+      const results = resultsObject.BuildResults;
+      const libraryString = 'Rebuilding Library because the asset database could not be found!';
+      const cachePushFail = 'Did not push source folder to cache because it was empty Library';
+      const buildSucceededString = 'Build succeeded';
+
+      expect(results).toContain(libraryString);
+      expect(results).toContain(buildSucceededString);
+      expect(results).not.toContain(cachePushFail);
+
+      CloudRunnerLogger.log(`run 1 succeeded`);
+
+      if (CloudRunnerOptions.providerStrategy === `local-docker`) {
+        await CloudRunnerSystem.Run(`tree ./cloud-runner-cache/cache`);
+        await CloudRunnerSystem.Run(
+          `cp ./cloud-runner-cache/cache/${buildParameter.cacheKey}/Library/lib-${buildParameter.buildGuid}.tar ./`,
+        );
+        await CloudRunnerSystem.Run(`mkdir results`);
+        await CloudRunnerSystem.Run(`tar -xf lib-${buildParameter.buildGuid}.tar -C ./results`);
+        await CloudRunnerSystem.Run(`tree -d ./results`);
+        const cacheFolderExists = fs.existsSync(`cloud-runner-cache/cache/${overrides.cacheKey}`);
+        expect(cacheFolderExists).toBeTruthy();
+      }
+      const buildParameter2 = await CreateParameters(overrides);
+
+      buildParameter2.cacheKey = buildParameter.cacheKey;
+      const baseImage2 = new ImageTag(buildParameter2);
+      const results2Object = await CloudRunner.run(buildParameter2, baseImage2.toString());
+      const results2 = results2Object.BuildResults;
+      CloudRunnerLogger.log(`run 2 succeeded`);
+
+      const build2ContainsCacheKey = results2.includes(buildParameter.cacheKey);
+      const build2ContainsBuildSucceeded = results2.includes(buildSucceededString);
+      const build2NotContainsZeroLibraryCacheFilesMessage = !results2.includes(
+        'There is 0 files/dir in the cache pulled contents for Library',
+      );
+      const build2NotContainsZeroLFSCacheFilesMessage = !results2.includes(
+        'There is 0 files/dir in the cache pulled contents for LFS',
+      );
+
+      expect(build2ContainsCacheKey).toBeTruthy();
+      expect(results2).toContain('Activation successful');
+      expect(build2ContainsBuildSucceeded).toBeTruthy();
+      expect(results2).toContain(buildSucceededString);
+      const splitResults = results2.split('Activation successful');
+      expect(splitResults[splitResults.length - 1]).not.toContain(libraryString);
+      expect(build2NotContainsZeroLibraryCacheFilesMessage).toBeTruthy();
+      expect(build2NotContainsZeroLFSCacheFilesMessage).toBeTruthy();
+    }, 1_000_000_000);
+  }
+});

src/model/cloud-runner/tests/e2e/cloud-runner-end2end-locking.test.ts

@@ -1,11 +1,11 @@
-import Orchestrator from '../../orchestrator';
+import CloudRunner from '../../cloud-runner';
 import { BuildParameters } from '../../..';
 import UnityVersioning from '../../../unity-versioning';
 import { Cli } from '../../../cli/cli';
-import OrchestratorLogger from '../../services/core/orchestrator-logger';
+import CloudRunnerLogger from '../../services/core/cloud-runner-logger';
 import { v4 as uuidv4 } from 'uuid';
-import OrchestratorOptions from '../../options/orchestrator-options';
+import CloudRunnerOptions from '../../options/cloud-runner-options';
-import setups from '../orchestrator-suite.test';
+import setups from '../cloud-runner-suite.test';
 import SharedWorkspaceLocking from '../../services/core/shared-workspace-locking';
 
 async function CreateParameters(overrides: any) {
@@ -16,10 +16,10 @@ async function CreateParameters(overrides: any) {
   return await BuildParameters.create();
 }
 
-describe('Orchestrator Locking', () => {
+describe('Cloud Runner Locking', () => {
   setups();
   it('Responds', () => {});
-  if (OrchestratorOptions.orchestratorDebug) {
+  if (CloudRunnerOptions.cloudRunnerDebug) {
     it(`Simple Locking End2End Flow`, async () => {
       const overrides: any = {
         versioning: 'None',
@@ -33,7 +33,7 @@ describe('Orchestrator Locking', () => {
 
       const newWorkspaceName = `test-workspace-${uuidv4()}`;
       const runId = uuidv4();
-      Orchestrator.buildParameters = buildParameters;
+      CloudRunner.buildParameters = buildParameters;
       await SharedWorkspaceLocking.CreateWorkspace(newWorkspaceName, buildParameters);
       expect(await SharedWorkspaceLocking.DoesCacheKeyTopLevelExist(buildParameters)).toBeTruthy();
       expect(await SharedWorkspaceLocking.DoesWorkspaceExist(newWorkspaceName, buildParameters)).toBeTruthy();
@@ -69,7 +69,7 @@ describe('Orchestrator Locking', () => {
         newWorkspaceName,
         buildParameters,
       );
-      OrchestratorLogger.log(JSON.stringify(locksBeforeRelease, undefined, 4));
+      CloudRunnerLogger.log(JSON.stringify(locksBeforeRelease, undefined, 4));
       expect(locksBeforeRelease.length).toBe(1);
       await SharedWorkspaceLocking.ReleaseWorkspace(newWorkspaceName, runId, buildParameters);
       const locks = await SharedWorkspaceLocking.GetAllLocksForWorkspace(newWorkspaceName, buildParameters);
@@ -85,7 +85,7 @@ describe('Orchestrator Locking', () => {
         (await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)) === false,
       ).toBeTruthy();
       await SharedWorkspaceLocking.CleanupWorkspace(newWorkspaceName, buildParameters);
-      OrchestratorLogger.log(`Starting get or create`);
+      CloudRunnerLogger.log(`Starting get or create`);
       expect(await SharedWorkspaceLocking.GetLockedWorkspace(newWorkspaceName, runId, buildParameters)).toBeTruthy();
     }, 350000);
   }