Skip to content

Commit 2326ca6

Browse files
authored
Fix image demands to be inline (#6640)
1 parent 2225197 commit 2326ca6

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

eng/pipelines/daily-verification.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
displayName: Daily vcpkg PR
55
pool:
66
name: $(WINDOWSPOOL)
7-
demands: $(WindowsImageDemand)
7+
demands: ImageOverride -equals $(WINDOWSVMIMAGE)
88

99
variables:
1010
# The branch in the azure-sdk/vcpkg repo that is updated daily with the

eng/pipelines/templates/variables/image.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,3 @@ variables:
2222
value: windows
2323
- name: MACOS
2424
value: macOS
25-
26-
- name: LinuxImageDemand
27-
value: ImageOverride -equals $(LINUXVMIMAGE)
28-
- name: WindowsImageDemand
29-
value: ImageOverride -equals $(WINDOWSVMIMAGE)

sdk/core/azure-core-amqp/Test-Setup.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ try {
3232

3333
Set-Location -Path "./azure-amqp/test/TestAmqpBroker"
3434

35-
Invoke-LoggedCommand "dotnet build -p RollForward=LatestMajor --framework net6.0"
35+
Invoke-LoggedCommand "dotnet build -p RollForward=LatestMajor --framework net8.0"
3636
if (!$? -ne 0) {
3737
Write-Error "Failed to build TestAmqpBroker."
3838
exit 1
@@ -43,7 +43,7 @@ try {
4343
# now that the Test broker has been built, launch the broker on a local address.
4444
Write-Host "Starting test broker listening on ${env:TEST_BROKER_ADDRESS} ..."
4545

46-
Set-Location -Path $WorkingDirectory/azure-amqp/bin/Debug/TestAmqpBroker/net6.0
46+
Set-Location -Path $WorkingDirectory/azure-amqp/bin/Debug/TestAmqpBroker/net8.0
4747

4848
# $job = dotnet exec ./TestAmqpBroker.dll ${env:TEST_BROKER_ADDRESS} /headless &
4949
$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

sdk/core/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ extends:
5858
PreTestSteps:
5959
- pwsh: |
6060
$(Build.SourcesDirectory)/sdk/core/azure-core-amqp/Test-Setup.ps1
61+
displayName: Test-Setup for azure-core-amqp
6162
env:
6263
TEST_BROKER_ADDRESS: "amqp://127.0.0.1:25672"
6364

0 commit comments

Comments
 (0)