Update VMs and pick up VS2019 16.10 (#18233)

* Cherry-pick https://github.com/microsoft/vcpkg/pull/15598

* Hook deploy-inteloneapi into create-vmss.ps1.

* Add script to resolve https://github.com/microsoft/vcpkg/issues/17521

* Move tls settings deployment to the front and respond to script triggering a reboot.

* Go back to provisioning an extra disk to workaround https://github.com/microsoft/vcpkg/issues/18379

* Disallow public access to blob storage and require TLS 1.2.

* Update Pools.

* Update tool to 2021-06-19

* [simage] Skip simage on uwp platforms as it appears broken by 16.10.

* [tensorflow-cc] Skip because changes in our MacOS hardware broke the port.

1 files changed, 40 insertions, 3 deletions

diff --git a/scripts/azure-pipelines/windows/create-vmss.ps1 b/scripts/azure-pipelines/windows/create-vmss.ps1
index fddba0eec..c3ea470d7 100644
--- a/scripts/azure-pipelines/windows/create-vmss.ps1
+++ b/scripts/azure-pipelines/windows/create-vmss.ps1
@@ -43,14 +43,15 @@ if ($Unstable) {
 }

 

 $Prefix += (Get-Date -Format 'yyyy-MM-dd')

-$VMSize = 'Standard_D16a_v4'

+$VMSize = 'Standard_D32_v4'

 $ProtoVMName = 'PROTOTYPE'

 $LiveVMPrefix = 'BUILD'

 $WindowsServerSku = '2019-Datacenter'

+$InstalledDiskSizeInGB = 1024

 $ErrorActionPreference = 'Stop'

 

 $ProgressActivity = 'Creating Scale Set'

-$TotalProgress = 18

+$TotalProgress = 21

 $CurrentProgress = 1

 

 Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking

@@ -176,7 +177,8 @@ New-AzStorageAccount `
   -Location $Location `

   -Name $StorageAccountName `

   -SkuName 'Standard_LRS' `

-  -Kind StorageV2

+  -Kind StorageV2 `

+  -MinimumTlsVersion TLS1_2

 

 $StorageAccountKeys = Get-AzStorageAccountKey `

   -ResourceGroupName $ResourceGroupName `

@@ -271,6 +273,16 @@ $VM = Set-AzVMSourceImage `
   -Skus $WindowsServerSku `

   -Version latest

 

+$InstallDiskName = $ProtoVMName + "InstallDisk"

+$VM = Add-AzVMDataDisk `

+  -Vm $VM `

+  -Name $InstallDiskName `

+  -Lun 0 `

+  -Caching ReadWrite `

+  -CreateOption Empty `

+  -DiskSizeInGB $InstalledDiskSizeInGB `

+  -StorageAccountType 'StandardSSD_LRS'

+

 $VM = Set-AzVMBootDiagnostic -VM $VM -Disable

 New-AzVm `

   -ResourceGroupName $ResourceGroupName `

@@ -280,6 +292,22 @@ New-AzVm `
 ####################################################################################################

 Write-Progress `

   -Activity $ProgressActivity `

+  -Status 'Running provisioning script deploy-tlssettings.ps1 in VM' `

+  -PercentComplete (100 / $TotalProgress * $CurrentProgress++)

+

+$ProvisionImageResult = Invoke-AzVMRunCommand `

+  -ResourceGroupName $ResourceGroupName `

+  -VMName $ProtoVMName `

+  -CommandId 'RunPowerShellScript' `

+  -ScriptPath "$PSScriptRoot\deploy-tlssettings.ps1"

+

+Write-Host "deploy-tlssettings.ps1 output: $($ProvisionImageResult.value.Message)"

+Write-Host 'Waiting 1 minute for VM to reboot...'

+Start-Sleep -Seconds 60

+

+####################################################################################################

+Write-Progress `

+  -Activity $ProgressActivity `

   -Status 'Running provisioning script deploy-psexec.ps1 in VM' `

   -PercentComplete (100 / $TotalProgress * $CurrentProgress++)

 

@@ -355,6 +383,10 @@ Invoke-ScriptWithPrefix -ScriptName 'deploy-cuda.ps1' -AddAdminPw -AddCudnnUrl
 Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName

 

 ####################################################################################################

+Invoke-ScriptWithPrefix -ScriptName 'deploy-inteloneapi.ps1' -AddAdminPw

+Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName

+

+####################################################################################################

 Invoke-ScriptWithPrefix -ScriptName 'deploy-pwsh.ps1' -AddAdminPw

 Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName

 

@@ -405,6 +437,10 @@ try {
 Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName

 

 ####################################################################################################

+Invoke-ScriptWithPrefix -ScriptName 'deploy-install-disk.ps1'

+Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName

+

+####################################################################################################

 Write-Progress `

   -Activity $ProgressActivity `

   -Status 'Running provisioning script sysprep.ps1 in VM' `

@@ -455,6 +491,7 @@ Write-Progress `
 

 Remove-AzVM -Id $VM.ID -Force

 Remove-AzDisk -ResourceGroupName $ResourceGroupName -DiskName $PrototypeOSDiskName -Force

+Remove-AzDisk -ResourceGroupName $ResourceGroupName -DiskName $InstallDiskName -Force

 

 ####################################################################################################

 Write-Progress `