Fix image demands to be inline (#6640)

This commit is contained in:
Wes Haggard 2025-06-24 15:03:09 -07:00 committed by GitHub
parent 22251970c6
commit 2326ca61c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 8 deletions

View File

@ -4,7 +4,7 @@ jobs:
displayName: Daily vcpkg PR
pool:
name: $(WINDOWSPOOL)
demands: $(WindowsImageDemand)
demands: ImageOverride -equals $(WINDOWSVMIMAGE)
variables:
# The branch in the azure-sdk/vcpkg repo that is updated daily with the

View File

@ -22,8 +22,3 @@ variables:
value: windows
- name: MACOS
value: macOS
- name: LinuxImageDemand
value: ImageOverride -equals $(LINUXVMIMAGE)
- name: WindowsImageDemand
value: ImageOverride -equals $(WINDOWSVMIMAGE)

View File

@ -32,7 +32,7 @@ try {
Set-Location -Path "./azure-amqp/test/TestAmqpBroker"
Invoke-LoggedCommand "dotnet build -p RollForward=LatestMajor --framework net6.0"
Invoke-LoggedCommand "dotnet build -p RollForward=LatestMajor --framework net8.0"
if (!$? -ne 0) {
Write-Error "Failed to build TestAmqpBroker."
exit 1
@ -43,7 +43,7 @@ try {
# now that the Test broker has been built, launch the broker on a local address.
Write-Host "Starting test broker listening on ${env:TEST_BROKER_ADDRESS} ..."
Set-Location -Path $WorkingDirectory/azure-amqp/bin/Debug/TestAmqpBroker/net6.0
Set-Location -Path $WorkingDirectory/azure-amqp/bin/Debug/TestAmqpBroker/net8.0
# $job = dotnet exec ./TestAmqpBroker.dll ${env:TEST_BROKER_ADDRESS} /headless &
$Process = Start-Process -NoNewWindow -FilePath "dotnet" -ArgumentList "exec ./TestAmqpBroker.dll ${env:TEST_BROKER_ADDRESS} /headless" -PassThru -RedirectStandardOutput $WorkingDirectory/test-broker.log -RedirectStandardError $WorkingDirectory/test-broker-error.log

View File

@ -58,6 +58,7 @@ extends:
PreTestSteps:
- pwsh: |
$(Build.SourcesDirectory)/sdk/core/azure-core-amqp/Test-Setup.ps1
displayName: Test-Setup for azure-core-amqp
env:
TEST_BROKER_ADDRESS: "amqp://127.0.0.1:25672"