Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update VMs for Patch Tuesday, 2021-08-11 #19508

Merged
merged 3 commits into from
Aug 13, 2021
Merged

Update VMs for Patch Tuesday, 2021-08-11 #19508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c8dbc3
Deploy SDKs with full features first to ensure we get Debugging Tools…
BillyONeal Aug 12, 2021
31dd8f6
Update VMs for Patch Tuesday, 2021-08-11
BillyONeal Aug 12, 2021
16a5c26
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Aug 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/azure-pipelines/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# SPDX-License-Identifier: MIT
#
variables:
windows-pool: 'PrWin-2021-07-14'
linux-pool: 'PrLin-2021-07-14'
windows-pool: 'PrWin-2021-08-12'
linux-pool: 'PrLin-2021-08-11'
osx-pool: 'PrOsx-2021-07-27'

stages:
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines/windows/create-vmss.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,11 @@ function Invoke-ScriptWithPrefix {
}
}

Invoke-ScriptWithPrefix -ScriptName 'deploy-visual-studio.ps1' -AddAdminPw
Invoke-ScriptWithPrefix -ScriptName 'deploy-windows-sdks.ps1' -AddAdminPw
Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName

####################################################################################################
Invoke-ScriptWithPrefix -ScriptName 'deploy-windows-wdk.ps1' -AddAdminPw
Invoke-ScriptWithPrefix -ScriptName 'deploy-visual-studio.ps1' -AddAdminPw
Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName

####################################################################################################
Expand Down
20 changes: 11 additions & 9 deletions ...-pipelines/windows/deploy-windows-wdk.ps1 → ...pipelines/windows/deploy-windows-sdks.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,27 @@

# REPLACE WITH UTILITY-PREFIX.ps1

$WindowsWDKUrl = 'https://go.microsoft.com/fwlink/?linkid=2128854'

<#
.SYNOPSIS
Installs Windows WDK version 2004
Installs Windows PSDK/WDK

.DESCRIPTION
Downloads the Windows WDK installer located at $Url, and installs it with the
Downloads the Windows PSDK/DDK installer located at $Url, and installs it with the
correct flags.

.PARAMETER Url
The URL of the installer.
#>
Function InstallWindowsWDK {
Function InstallWindowsDK {
Param(
[String]$Url
)

try {
Write-Host 'Downloading Windows WDK...'
Write-Host "Downloading Windows PSDK or DDK $Url..."
[string]$installerPath = Get-TempFilePath -Extension 'exe'
curl.exe -L -o $installerPath -s -S $Url
Write-Host 'Installing Windows WDK...'
Write-Host 'Installing...'
$proc = Start-Process -FilePath $installerPath -ArgumentList @('/features', '+', '/q') -Wait -PassThru
$exitCode = $proc.ExitCode
if ($exitCode -eq 0) {
Expand All @@ -39,9 +37,13 @@ Function InstallWindowsWDK {
}
}
catch {
Write-Error "Failed to install Windows WDK! $($_.Exception.Message)"
Write-Error "Failed to install Windows PSDK or DDK! $($_.Exception.Message)"
throw
}
}

InstallWindowsWDK -Url $WindowsWDKUrl
# Windows 10 SDK, version 2004 (10.0.19041.0)
InstallWindowsDK 'https://go.microsoft.com/fwlink/?linkid=2120843'

# Windows 10 WDK, version 2004
InstallWindowsDK 'https://go.microsoft.com/fwlink/?linkid=2128854'
2 changes: 1 addition & 1 deletion scripts/azure-pipelines/windows/provision-entire-image.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
. "$PSScriptRoot\utility-prefix.ps1"

. "$PSScriptRoot\deploy-tlssettings.ps1" -RebootIfRequired 0
. "$PSScriptRoot\deploy-windows-sdks.ps1"
. "$PSScriptRoot\deploy-visual-studio.ps1"
. "$PSScriptRoot\deploy-windows-wdk.ps1"
. "$PSScriptRoot\deploy-mpi.ps1"
. "$PSScriptRoot\deploy-cuda.ps1"
. "$PSScriptRoot\deploy-inteloneapi.ps1"
Expand Down