Restore pipeline output variable for Agent OS name (#1709)

Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
Azure · Feb 22, 2021 · 7e22da0 · 7e22da0
1 parent 0dfe2f4
commit 7e22da0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/eng/common/pipelines/templates/steps/verify-agent-os.yml b/eng/common/pipelines/templates/steps/verify-agent-os.yml
@@ -13,4 +13,4 @@ steps:
       workingDirectory: $(System.DefaultWorkingDirectory)
       filePath: ${{ parameters.ScriptDirectory }}/Verify-AgentOS.ps1
       arguments: >
-        -AgentImage ${{ parameters.AgentImage }}
+        -AgentImage "${{ parameters.AgentImage }}"
diff --git a/eng/common/scripts/Verify-AgentOS.ps1 b/eng/common/scripts/Verify-AgentOS.ps1
@@ -8,6 +8,14 @@ function Throw-InvalidOperatingSystem {
     throw "Invalid operating system detected. Operating system was: $([System.Runtime.InteropServices.RuntimeInformation]::OSDescription), expected image was: $AgentImage"
 }
 
-if ($AgentImage -match "windows|win|MMS2019" -and !$IsWindows) { Throw-InvalidOperatingSystem }
-if ($AgentImage -match "ubuntu" -and !$IsLinux) { Throw-InvalidOperatingSystem }
-if ($AgentImage -match "macos" -and !$IsMacOs) { Throw-InvalidOperatingSystem }
+if ($IsWindows -and $AgentImage -match "windows|win|MMS2019") {
+    $osName = "Windows"
+} elseif ($IsLinux -and $AgentImage -match "ubuntu") {
+    $osName = "Linux"
+} elseif ($IsMacOs -and $AgentImage -match "macos") {
+    $osName = "macOS"
+} else {
+    Throw-InvalidOperatingSystem
+}
+
+Write-Host "##vso[task.setvariable variable=OSName]$osName"