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.

2 files changed, 25 insertions, 3 deletions

diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1
index 55484f29b..2bfaae2f0 100755
--- a/scripts/azure-pipelines/linux/create-vmss.ps1
+++ b/scripts/azure-pipelines/linux/create-vmss.ps1
@@ -20,7 +20,7 @@ This script assumes you have installed the OpenSSH Client optional Windows compo
 

 $Location = 'westus2'

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

-$VMSize = 'Standard_D16a_v4'

+$VMSize = 'Standard_D32_v4'

 $ProtoVMName = 'PROTOTYPE'

 $LiveVMPrefix = 'BUILD'

 $ErrorActionPreference = 'Stop'

@@ -161,7 +161,8 @@ New-AzStorageAccount `
   -Location $Location `

   -Name $StorageAccountName `

   -SkuName 'Standard_LRS' `

-  -Kind StorageV2

+  -Kind StorageV2 `

+  -MinimumTlsVersion TLS1_2

 

 $StorageAccountKeys = Get-AzStorageAccountKey `

   -ResourceGroupName $ResourceGroupName `

@@ -338,7 +339,8 @@ $Vmss = Set-AzVmssOsProfile `
   -AdminUsername AdminUser `

   -AdminPassword $AdminPW `

   -LinuxConfigurationDisablePasswordAuthentication $true `

-  -PublicKey @($VmssPublicKey)

+  -PublicKey @($VmssPublicKey) `

+  -CustomData ([Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("#!/bin/bash`n/etc/provision-disks.sh`n")))

 

 $Vmss = Set-AzVmssStorageProfile `

   -VirtualMachineScaleSet $Vmss `

@@ -346,6 +348,14 @@ $Vmss = Set-AzVmssStorageProfile `
   -OsDiskCaching ReadWrite `

   -ImageReferenceId $Image.Id

 

+$Vmss = Add-AzVmssDataDisk `

+  -VirtualMachineScaleSet $Vmss `

+  -Lun 0 `

+  -Caching 'ReadWrite' `

+  -CreateOption Empty `

+  -DiskSizeGB 1024 `

+  -StorageAccountType 'StandardSSD_LRS'

+

 New-AzVmss `

   -ResourceGroupName $ResourceGroupName `

   -Name $VmssName `

diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh
index 6663baed8..5336e86f6 100755
--- a/scripts/azure-pipelines/linux/provision-image.sh
+++ b/scripts/azure-pipelines/linux/provision-image.sh
@@ -73,4 +73,16 @@ sudo apt update
 sudo add-apt-repository universe
 sudo apt install -y powershell
 
+# Write script to provision disks used by cloud-init
+echo "if [ ! -d \"/mnt/vcpkg-ci\" ]; then" > /etc/provision-disks.sh
+echo "sudo parted /dev/sdb mklabel gpt" >> /etc/provision-disks.sh
+echo "sudo parted /dev/sdb mkpart cidisk ext4 0% 100%" >> /etc/provision-disks.sh
+echo "sudo mkfs -t ext4 /dev/sdb1" >> /etc/provision-disks.sh
+echo "sudo mkdir /mnt/vcpkg-ci -m=777" >> /etc/provision-disks.sh
+echo "echo \"/dev/sdb1 /mnt/vcpkg-ci ext4 barrier=0 0 0\" | sudo tee -a /etc/fstab" >> /etc/provision-disks.sh
+echo "sudo mount -a" >> /etc/provision-disks.sh
+echo "sudo chmod 777 /mnt/vcpkg-ci" >> /etc/provision-disks.sh
+echo "fi" >> /etc/provision-disks.sh
+sudo chmod 700 /etc/provision-disks.sh
+
 # provision-image.ps1 will append installation of the SAS token here