diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-08-27 12:27:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-27 12:27:39 -0700 |
| commit | 8054263f15c8400d6df5fff55fae97394e187368 (patch) | |
| tree | a5cc0464457d382ca6f4c9b6e6f7c280408f1101 /scripts/azure-pipelines/linux | |
| parent | 99212d675f12c38b80ee6c38074e39cd9777339e (diff) | |
| download | vcpkg-8054263f15c8400d6df5fff55fae97394e187368.tar.gz vcpkg-8054263f15c8400d6df5fff55fae97394e187368.zip | |
[skia, ompl, capnproto] Update VMs for 2020-08-12 (including VS 16.7) (#12884)
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'scripts/azure-pipelines/linux')
| -rwxr-xr-x | scripts/azure-pipelines/linux/create-vmss.ps1 | 4 | ||||
| -rwxr-xr-x | scripts/azure-pipelines/linux/provision-image.sh | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1 index 84c83dfea..169a80fc9 100755 --- a/scripts/azure-pipelines/linux/create-vmss.ps1 +++ b/scripts/azure-pipelines/linux/create-vmss.ps1 @@ -220,7 +220,7 @@ Write-Progress ` -Status 'Running provisioning script provision-image.sh in VM' `
-PercentComplete (100 / $TotalProgress * $CurrentProgress++)
-Invoke-AzVMRunCommand `
+$ProvisionImageResult = Invoke-AzVMRunCommand `
-ResourceGroupName $ResourceGroupName `
-VMName $ProtoVMName `
-CommandId 'RunShellScript' `
@@ -228,6 +228,8 @@ Invoke-AzVMRunCommand ` -Parameter @{StorageAccountName=$StorageAccountName; `
StorageAccountKey=$StorageAccountKey;}
+Write-Host "provision-image.sh output: $($ProvisionImageResult.value.Message)"
+
####################################################################################################
Write-Progress `
-Activity $ProgressActivity `
diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 5a59161e6..4936cf719 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -27,7 +27,10 @@ APT_PACKAGES="$APT_PACKAGES libxkbcommon-dev libxcb-keysyms1-dev \ APT_PACKAGES="$APT_PACKAGES libkrb5-dev" # Additionally required by mesa -APT_PACKAGES="$APT_PACKAGES python3-setuptools" +APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-mako" + +# Additionally required by some packages to install additional python packages +APT_PACKAGES="$APT_PACKAGES python3-pip" # Additionally required/installed by Azure DevOps Scale Set Agents APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu60" |