actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-08 03:07:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set AGENT_TOOLSDIRECTORY in packer template (#2457)

Browse Source 
* Set AGENT_TOOLSDIRECTORY in packer template
This was set in the ruby installer but it is referenced elsewhere so I
believe it makes the most sense to have this set centrally in the packer
template to be referenced across multiple scripts.

* Fix typo

* Capitalize env var in ws2016 template for consistency

* Set AGENT_TOOLSDIRECTORY in Initialize-VM.ps1

* Add missing env var for AGENT_TOOLSDIRECTORY in step in ws2016 template
This commit is contained in:
Ryan Spletzer
2021-02-09 08:41:06 -05:00
committed by GitHub
parent b45f42aa9f
commit 902346ebcd
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
images/win/scripts/Installers/Initialize-VM.ps1
View File

@@ -36,6 +36,7 @@ Add-Content -Path $profile.AllUsersAllHosts -Value '$ErrorActionPreference="Stop
# Set static env vars # Set static env vars
setx ImageVersion $env:IMAGE_VERSION /m setx ImageVersion $env:IMAGE_VERSION /m
setx ImageOS $env:IMAGE_OS /m setx ImageOS $env:IMAGE_OS /m
setx AGENT_TOOLSDIRECTORY $env:AGENT_TOOLSDIRECTORY /m
# Set TLS1.2 # Set TLS1.2
[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12"

5
images/win/scripts/Installers/Install-Ruby.ps1
View File

@@ -98,11 +98,6 @@ function Set-DefaultRubyVersion
Add-MachinePathItem -PathItem $rubyDir | Out-Null Add-MachinePathItem -PathItem $rubyDir | Out-Null
} }
# Define AGENT_TOOLSDIRECTORY environment variable
$toolsDirectory = "C:/hostedtoolcache/windows"
$env:AGENT_TOOLSDIRECTORY = $toolsDirectory
setx AGENT_TOOLSDIRECTORY $toolsDirectory /M
# Install Ruby # Install Ruby
$rubyTools = (Get-ToolsetContent).toolcache | Where-Object { $_.name -eq "Ruby" } $rubyTools = (Get-ToolsetContent).toolcache | Where-Object { $_.name -eq "Ruby" }
$rubyToolVersions = $rubyTools.versions $rubyToolVersions = $rubyTools.versions

2
images/win/windows2016.json
View File

@@ -21,6 +21,7 @@
"imagedata_file": "C:\\imagedata.json", "imagedata_file": "C:\\imagedata.json",
"helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\", "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\",
"psmodules_root_folder": "C:\\Modules", "psmodules_root_folder": "C:\\Modules",
"agent_tools_directory": "C:\\hostedtoolcache\\windows",
"install_user": "installer", "install_user": "installer",
"install_password": null, "install_password": null,
"capture_name_prefix": "packer", "capture_name_prefix": "packer",
@@ -114,6 +115,7 @@
"environment_vars": [ "environment_vars": [
"IMAGE_VERSION={{user `image_version`}}", "IMAGE_VERSION={{user `image_version`}}",
"IMAGE_OS={{user `image_os`}}", "IMAGE_OS={{user `image_os`}}",
"AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}",
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
"PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}"
], ],

2
images/win/windows2019.json
View File

@@ -21,6 +21,7 @@
"imagedata_file": "C:\\imagedata.json", "imagedata_file": "C:\\imagedata.json",
"helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\", "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\",
"psmodules_root_folder": "C:\\Modules", "psmodules_root_folder": "C:\\Modules",
"agent_tools_directory": "C:\\hostedtoolcache\\windows",
"install_user": "installer", "install_user": "installer",
"install_password": null, "install_password": null,
"capture_name_prefix": "packer", "capture_name_prefix": "packer",
@@ -114,6 +115,7 @@
"environment_vars": [ "environment_vars": [
"IMAGE_VERSION={{user `image_version`}}", "IMAGE_VERSION={{user `image_version`}}",
"IMAGE_OS={{user `image_os`}}", "IMAGE_OS={{user `image_os`}}",
"AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}",
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
"PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}"
], ],