From f7d1f75f15b03bfb3e63a02907651ce78b6594ff Mon Sep 17 00:00:00 2001 From: James Stocks Date: Thu, 2 Apr 2020 10:31:15 +0100 Subject: [PATCH] Change S3 URL for fetching ruby+devkit The S3 bucket URL (https://public-cd-buildkite-cache.s3-us-west-2.amazonaws.com/rubyinstaller-devkit-2.6.5-1-x64.exe) no longer works. Signed-off-by: James Stocks --- .expeditor/buildkite/artifact.habitat.test.ps1 | 3 +-- omnibus/omnibus-test.ps1 | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.expeditor/buildkite/artifact.habitat.test.ps1 b/.expeditor/buildkite/artifact.habitat.test.ps1 index b2c69c6d9..9bbdb17b7 100755 --- a/.expeditor/buildkite/artifact.habitat.test.ps1 +++ b/.expeditor/buildkite/artifact.habitat.test.ps1 @@ -39,8 +39,7 @@ Write-Host "--- Installing $pkg_ident/$pkg_artifact" hab pkg install -b $project_root/results/$pkg_artifact Write-Host "--- Downloading Ruby + DevKit" -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -(New-Object System.Net.WebClient).DownloadFile('https://public-cd-buildkite-cache.s3-us-west-2.amazonaws.com/rubyinstaller-devkit-2.6.5-1-x64.exe', 'c:\\rubyinstaller-devkit-2.6.5-1-x64.exe') +aws s3 cp s3://core-buildkite-cache-chef-prod/rubyinstaller-devkit-2.6.5-1-x64.exe c:/rubyinstaller-devkit-2.6.5-1-x64.exe Write-Host "--- Installing Ruby + DevKit" Start-Process c:\rubyinstaller-devkit-2.6.5-1-x64.exe -ArgumentList '/verysilent /dir=C:\\ruby26' -Wait diff --git a/omnibus/omnibus-test.ps1 b/omnibus/omnibus-test.ps1 index 9267eb999..1b0825fd9 100644 --- a/omnibus/omnibus-test.ps1 +++ b/omnibus/omnibus-test.ps1 @@ -22,8 +22,7 @@ Write-Output "--- Running verification for $channel $product $version" $Env:PATH = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User") Write-Host "--- Downloading Ruby + DevKit" -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -(New-Object System.Net.WebClient).DownloadFile('https://public-cd-buildkite-cache.s3-us-west-2.amazonaws.com/rubyinstaller-devkit-2.6.5-1-x64.exe', 'c:\\rubyinstaller-devkit-2.6.5-1-x64.exe') +aws s3 cp s3://core-buildkite-cache-chef-prod/rubyinstaller-devkit-2.6.5-1-x64.exe c:/rubyinstaller-devkit-2.6.5-1-x64.exe Write-Host "--- Installing Ruby + DevKit" Start-Process c:\rubyinstaller-devkit-2.6.5-1-x64.exe -ArgumentList '/verysilent /dir=C:\\ruby26' -Wait