diff --git a/images/macos/scripts/build/install-runner-package.sh b/images/macos/scripts/build/install-runner-package.sh deleted file mode 100644 index 9560d1a1b..000000000 --- a/images/macos/scripts/build/install-runner-package.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -e -o pipefail -################################################################################ -## File: install-runner-package.sh -## Desc: Download and Install runner package -################################################################################ - -# Source the helpers for use with the script -source ~/utils/utils.sh - -AGENT_PATH="/opt/runner-cache" -arch=$(get_arch) -download_url=$(resolve_github_release_asset_url "actions/runner" 'test("actions-runner-osx-'"$arch"'-[0-9]+\\.[0-9]{3}\\.[0-9]+\\.tar\\.gz$")' "latest" "$API_PAT") -archive_name="${download_url##*/}" -archive_path=$(download_with_retry "$download_url") - -if [[ ! -d $AGENT_PATH ]]; then - sudo mkdir -p -m 775 $AGENT_PATH - sudo chown $USER:admin $AGENT_PATH -fi - -sudo mv "$archive_path" "$AGENT_PATH/$archive_name" diff --git a/images/macos/scripts/tests/RunnerCache.Tests.ps1 b/images/macos/scripts/tests/RunnerCache.Tests.ps1 deleted file mode 100644 index 8c8109ef0..000000000 --- a/images/macos/scripts/tests/RunnerCache.Tests.ps1 +++ /dev/null @@ -1,7 +0,0 @@ -Describe "RunnerCache" { - Context "runner cache directory not empty" { - It " not empty" -TestCases @{ RunnerCachePath = "/opt/runner-cache" } { - (Get-ChildItem -Path "$RunnerCachePath/*.tar.gz" -Recurse).Count | Should -BeGreaterThan 0 - } - } -} diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 1aca6f139..f764115fd 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -236,7 +236,6 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" scripts = [ "${path.root}/../scripts/build/install-actions-cache.sh", - "${path.root}/../scripts/build/install-runner-package.sh", "${path.root}/../scripts/build/install-llvm.sh", "${path.root}/../scripts/build/install-swiftlint.sh", "${path.root}/../scripts/build/install-openjdk.sh", diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl index 34052b4c3..55137b0eb 100644 --- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl @@ -237,7 +237,6 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" scripts = [ "${path.root}/../scripts/build/install-actions-cache.sh", - "${path.root}/../scripts/build/install-runner-package.sh", "${path.root}/../scripts/build/install-llvm.sh", "${path.root}/../scripts/build/install-openjdk.sh", "${path.root}/../scripts/build/install-aws-tools.sh", diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl index fb21aa8d0..0ebdf537c 100644 --- a/images/macos/templates/macOS-14.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.anka.pkr.hcl @@ -235,7 +235,6 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" scripts = [ "${path.root}/../scripts/build/install-actions-cache.sh", - "${path.root}/../scripts/build/install-runner-package.sh", "${path.root}/../scripts/build/install-llvm.sh", "${path.root}/../scripts/build/install-swiftlint.sh", "${path.root}/../scripts/build/install-openjdk.sh", diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl index 267ff4f84..79fe9628c 100644 --- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl @@ -236,7 +236,6 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" scripts = [ "${path.root}/../scripts/build/install-actions-cache.sh", - "${path.root}/../scripts/build/install-runner-package.sh", "${path.root}/../scripts/build/install-llvm.sh", "${path.root}/../scripts/build/install-openjdk.sh", "${path.root}/../scripts/build/install-aws-tools.sh", diff --git a/images/macos/templates/macOS-15.anka.pkr.hcl b/images/macos/templates/macOS-15.anka.pkr.hcl index 8cde8442a..d39e8f3ff 100644 --- a/images/macos/templates/macOS-15.anka.pkr.hcl +++ b/images/macos/templates/macOS-15.anka.pkr.hcl @@ -234,7 +234,6 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" scripts = [ "${path.root}/../scripts/build/install-actions-cache.sh", - "${path.root}/../scripts/build/install-runner-package.sh", "${path.root}/../scripts/build/install-llvm.sh", "${path.root}/../scripts/build/install-swiftlint.sh", "${path.root}/../scripts/build/install-openjdk.sh", diff --git a/images/macos/templates/macOS-15.arm64.anka.pkr.hcl b/images/macos/templates/macOS-15.arm64.anka.pkr.hcl index dcb553313..ab260c306 100644 --- a/images/macos/templates/macOS-15.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-15.arm64.anka.pkr.hcl @@ -235,7 +235,6 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" scripts = [ "${path.root}/../scripts/build/install-actions-cache.sh", - "${path.root}/../scripts/build/install-runner-package.sh", "${path.root}/../scripts/build/install-llvm.sh", "${path.root}/../scripts/build/install-openjdk.sh", "${path.root}/../scripts/build/install-aws-tools.sh", diff --git a/images/macos/templates/macOS-26.arm64.anka.pkr.hcl b/images/macos/templates/macOS-26.arm64.anka.pkr.hcl index d973f46b4..ae4e52570 100644 --- a/images/macos/templates/macOS-26.arm64.anka.pkr.hcl +++ b/images/macos/templates/macOS-26.arm64.anka.pkr.hcl @@ -234,7 +234,6 @@ build { execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}" scripts = [ "${path.root}/../scripts/build/install-actions-cache.sh", - "${path.root}/../scripts/build/install-runner-package.sh", "${path.root}/../scripts/build/install-llvm.sh", "${path.root}/../scripts/build/install-openjdk.sh", "${path.root}/../scripts/build/install-aws-tools.sh", diff --git a/images/ubuntu/scripts/build/install-runner-package.sh b/images/ubuntu/scripts/build/install-runner-package.sh deleted file mode 100644 index 019689ee4..000000000 --- a/images/ubuntu/scripts/build/install-runner-package.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -e -################################################################################ -## File: install-runner-package.sh -## Desc: Download and Install runner package -################################################################################ - -# Source the helpers for use with the script -source $HELPER_SCRIPTS/install.sh - -download_url=$(resolve_github_release_asset_url "actions/runner" 'test("actions-runner-linux-x64-[0-9]+\\.[0-9]{3}\\.[0-9]+\\.tar\\.gz$")' "latest") -archive_name="${download_url##*/}" -archive_path=$(download_with_retry "$download_url") - -mkdir -p /opt/runner-cache -mv "$archive_path" "/opt/runner-cache/$archive_name" diff --git a/images/ubuntu/scripts/tests/RunnerCache.Tests.ps1 b/images/ubuntu/scripts/tests/RunnerCache.Tests.ps1 deleted file mode 100644 index 8c8109ef0..000000000 --- a/images/ubuntu/scripts/tests/RunnerCache.Tests.ps1 +++ /dev/null @@ -1,7 +0,0 @@ -Describe "RunnerCache" { - Context "runner cache directory not empty" { - It " not empty" -TestCases @{ RunnerCachePath = "/opt/runner-cache" } { - (Get-ChildItem -Path "$RunnerCachePath/*.tar.gz" -Recurse).Count | Should -BeGreaterThan 0 - } - } -} diff --git a/images/ubuntu/templates/build.ubuntu-22_04.pkr.hcl b/images/ubuntu/templates/build.ubuntu-22_04.pkr.hcl index 5784ff0b5..dcda4fb16 100644 --- a/images/ubuntu/templates/build.ubuntu-22_04.pkr.hcl +++ b/images/ubuntu/templates/build.ubuntu-22_04.pkr.hcl @@ -99,7 +99,6 @@ build { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ "${path.root}/../scripts/build/install-actions-cache.sh", - "${path.root}/../scripts/build/install-runner-package.sh", "${path.root}/../scripts/build/install-apt-common.sh", "${path.root}/../scripts/build/install-azcopy.sh", "${path.root}/../scripts/build/install-azure-cli.sh", diff --git a/images/ubuntu/templates/build.ubuntu-24_04.pkr.hcl b/images/ubuntu/templates/build.ubuntu-24_04.pkr.hcl index 30d6c6c18..49600c33b 100644 --- a/images/ubuntu/templates/build.ubuntu-24_04.pkr.hcl +++ b/images/ubuntu/templates/build.ubuntu-24_04.pkr.hcl @@ -99,7 +99,6 @@ provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ "${path.root}/../scripts/build/install-actions-cache.sh", - "${path.root}/../scripts/build/install-runner-package.sh", "${path.root}/../scripts/build/install-apt-common.sh", "${path.root}/../scripts/build/install-azcopy.sh", "${path.root}/../scripts/build/install-azure-cli.sh", diff --git a/images/windows/scripts/build/Install-Runner.ps1 b/images/windows/scripts/build/Install-Runner.ps1 deleted file mode 100644 index dc7a6f7f3..000000000 --- a/images/windows/scripts/build/Install-Runner.ps1 +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -## File: Install-Runner.ps1 -## Desc: Install Runner for GitHub Actions -## Supply chain security: none -################################################################################ - -Write-Host "Download latest Runner for GitHub Actions" -$downloadUrl = Resolve-GithubReleaseAssetUrl ` - -Repo "actions/runner" ` - -Version "latest" ` - -UrlMatchPattern "actions-runner-win-x64-*[0-9.].zip" -$fileName = Split-Path $downloadUrl -Leaf -New-Item -Path "C:\ProgramData\runner" -ItemType Directory -Invoke-DownloadWithRetry -Url $downloadUrl -Path "C:\ProgramData\runner\$fileName" - -Invoke-PesterTests -TestFile "RunnerCache" diff --git a/images/windows/scripts/tests/RunnerCache.tests.ps1 b/images/windows/scripts/tests/RunnerCache.tests.ps1 deleted file mode 100644 index 8c932fb92..000000000 --- a/images/windows/scripts/tests/RunnerCache.tests.ps1 +++ /dev/null @@ -1,7 +0,0 @@ -Describe "RunnerCache" { - Context "runner cache directory not empty" { - It "C:\ProgramData\runner" { - (Get-ChildItem -Path "C:\ProgramData\runner\*.zip" -Recurse).Count | Should -BeGreaterThan 0 - } - } -} diff --git a/images/windows/templates/build.windows-2019.pkr.hcl b/images/windows/templates/build.windows-2019.pkr.hcl index 8de0380e5..9b41e560d 100644 --- a/images/windows/templates/build.windows-2019.pkr.hcl +++ b/images/windows/templates/build.windows-2019.pkr.hcl @@ -101,7 +101,6 @@ build { "${path.root}/../scripts/build/Install-DockerCompose.ps1", "${path.root}/../scripts/build/Install-PowershellCore.ps1", "${path.root}/../scripts/build/Install-WebPlatformInstaller.ps1", - "${path.root}/../scripts/build/Install-Runner.ps1", "${path.root}/../scripts/build/Install-TortoiseSvn.ps1" ] } diff --git a/images/windows/templates/build.windows-2022.pkr.hcl b/images/windows/templates/build.windows-2022.pkr.hcl index 95d08ec01..7bcd66cc3 100644 --- a/images/windows/templates/build.windows-2022.pkr.hcl +++ b/images/windows/templates/build.windows-2022.pkr.hcl @@ -91,7 +91,6 @@ build { "${path.root}/../scripts/build/Install-DockerCompose.ps1", "${path.root}/../scripts/build/Install-PowershellCore.ps1", "${path.root}/../scripts/build/Install-WebPlatformInstaller.ps1", - "${path.root}/../scripts/build/Install-Runner.ps1", "${path.root}/../scripts/build/Install-TortoiseSvn.ps1" ] } diff --git a/images/windows/templates/build.windows-2025.pkr.hcl b/images/windows/templates/build.windows-2025.pkr.hcl index a84729d48..97d7c5e6e 100644 --- a/images/windows/templates/build.windows-2025.pkr.hcl +++ b/images/windows/templates/build.windows-2025.pkr.hcl @@ -91,8 +91,7 @@ provisioner "powershell" { "${path.root}/../scripts/build/Install-DockerWinCred.ps1", "${path.root}/../scripts/build/Install-DockerCompose.ps1", "${path.root}/../scripts/build/Install-PowershellCore.ps1", - "${path.root}/../scripts/build/Install-WebPlatformInstaller.ps1", - "${path.root}/../scripts/build/Install-Runner.ps1" + "${path.root}/../scripts/build/Install-WebPlatformInstaller.ps1" ] }