diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 76049cdc0c..5a3ae2b133 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -3,7 +3,7 @@ # variables: android-pool: 'PrAnd-2023-07-12' - linux-pool: 'PrLin-2023-07-12' + linux-pool: 'PrLin-1ES-Pool' windows-pool: 'PrWin-2023-07-12' osx-pool: 'PrOsx-2022-02-04' linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-04-20' diff --git a/scripts/azure-pipelines/generate-sas-tokens.ps1 b/scripts/azure-pipelines/generate-sas-tokens.ps1 index ddd417384e..d6a5dbc1c6 100644 --- a/scripts/azure-pipelines/generate-sas-tokens.ps1 +++ b/scripts/azure-pipelines/generate-sas-tokens.ps1 @@ -34,6 +34,7 @@ $assetSas = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-asset-cache -Stor # Read, Create, List, Write $binarySas = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycache -ContainerName cache -Permission rclw $binaryEASas = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycacheeastasia -ContainerName cache -Permission rclw +$binaryWUS3as = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycacheewus3 -ContainerName cache -Permission rclw $response = "Asset Cache SAS: Update`n" + ` "https://dev.azure.com/vcpkg/public/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=6&path=vcpkg-asset-caching-credentials`n" + ` @@ -49,6 +50,8 @@ $response = "Asset Cache SAS: Update`n" + ` "sas-bin:`n" + ` "$binarySas`n" + ` "sas-bin-ea:`n" + ` - "$binaryEASas`n" + "$binaryEASas`n" + ` + "sas-bin-wus3:`n" + ` + "$binaryWUS3as`n" Write-Host $response diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 9383299d7f..35d3d43847 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -32,7 +32,7 @@ jobs: value: "x-azurl,$(root-url-ea),$(sas-ea),readwrite" - group: vcpkg-binary-caching-credentials - name: X_VCPKG_BINARY_SOURCE_STUB - value: "x-azblob,$(root-bin-url-ea),$(sas-bin-ea)" + value: "x-azblob,$(root-bin-url-wus3),$(sas-bin-wus3)" steps: # Note: /mnt is the Azure machines' temporary disk. diff --git a/scripts/azure-pipelines/linux/managed-image.json b/scripts/azure-pipelines/linux/managed-image.json new file mode 100644 index 0000000000..b26239528e --- /dev/null +++ b/scripts/azure-pipelines/linux/managed-image.json @@ -0,0 +1,16 @@ +{ + "artifacts": [ + { + "name": "linux-install-packages", + "parameters": { + "packages": "git curl zip unzip tar at libxt-dev gperf libxaw7-dev cifs-utils build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev libxcursor-dev yasm libnuma1 libnuma-dev libtool-bin flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full pkg-config meson nasm cmake ninja-build libxext-dev libxfixes-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev libxkbcommon-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libxcb-cursor-dev libkrb5-dev libxcb-res0-dev libxcb-keysyms1-dev libxcb-xkb-dev libxcb-record0-dev python3-setuptools python3-mako python3-pip python3-venv nodejs libwayland-dev python-is-python3 guile-2.2-dev libxdamage-dev libdbus-1-dev libxtst-dev haskell-stack golang-go" + } + }, + { + "name": "linux-ubuntu2204-nvidia-cuda-cudnn" + }, + { + "name": "linux-install-powershell" + } + ] +}