From 65e31c1971d9da5dea9c01d41d8b8a1857b1107a Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Fri, 1 Nov 2024 16:29:23 -0700 Subject: [PATCH] Use PublishToAzureServiceBus@2 for all jobs --- build/baselines-database-scenarios.yml | 10 +- build/baselines-scenarios.yml | 10 +- build/benchmarks-ci-01.yml | 148 ++++++++++++++++++------ build/benchmarks-ci-02.yml | 124 +++++++++++++++----- build/benchmarks-ci-azure.yml | 40 +++++-- build/benchmarks.matrix.01.yml | 10 +- build/benchmarks.matrix.02.yml | 7 +- build/benchmarks.matrix.azure.yml | 4 +- build/benchmarks.template.liquid | 4 +- build/blazor-scenarios.yml | 14 ++- build/build-perf-scenarios.yml | 10 +- build/containers-scenarios.yml | 10 +- build/crossgen2-scenarios.yml | 10 +- build/efcore-scenarios.yml | 10 +- build/frameworks-database-scenarios.yml | 10 +- build/frameworks-scenarios.yml | 10 +- build/gc-scenarios.yml | 10 +- build/grpc-scenarios.yml | 18 ++- build/httpclient-scenarios.yml | 14 ++- build/mono-database-scenarios.yml | 10 +- build/mono-scenarios.yml | 10 +- build/mvc-scenarios.yml | 10 +- build/nativeaot-scenarios.yml | 10 +- build/pgo-scenarios.yml | 8 +- build/proxies-custom-scenarios.yml | 8 +- build/proxies-scenarios.yml | 10 +- build/signalr-scenarios.yml | 8 +- build/singlefile-scenarios.yml | 8 +- build/sslstream-scenarios.yml | 14 ++- build/trend-database-scenarios.yml | 2 +- build/trend-scenarios.yml | 8 +- build/websocket-scenarios.yml | 8 +- 32 files changed, 465 insertions(+), 122 deletions(-) diff --git a/build/baselines-database-scenarios.yml b/build/baselines-database-scenarios.yml index d9431344..0dc89169 100644 --- a/build/baselines-database-scenarios.yml +++ b/build/baselines-database-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -56,12 +62,14 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - ${{ each b in parameters.baselines }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 10 displayName: "${{ s.displayName }} - ${{ b.displayName }}" inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/baselines-scenarios.yml b/build/baselines-scenarios.yml index e5b47ac1..910cda48 100644 --- a/build/baselines-scenarios.yml +++ b/build/baselines-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -63,12 +69,14 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - ${{ each b in parameters.baselines }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 10 displayName: "${{ s.displayName }} - ${{ b.displayName }}" inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/benchmarks-ci-01.yml b/build/benchmarks-ci-01.yml index e7174ce6..978d8516 100644 --- a/build/benchmarks-ci-01.yml +++ b/build/benchmarks-ci-01.yml @@ -54,7 +54,9 @@ jobs: steps: - template: trend-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load " - job: Trends_Database_Arm_28_Linux @@ -110,7 +112,9 @@ jobs: steps: - template: trend-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load2-load " - job: Native_Aot_Arm_28_Linux @@ -122,7 +126,9 @@ jobs: steps: - template: nativeaot-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile arm-lin-28-app --profile amd-lin-load --profile amd-lin2-db " - job: Trends_Gold_Windows @@ -134,7 +140,9 @@ jobs: steps: - template: trend-scenarios.yml parameters: - connection: ASP.NET Benchmarks Mono Queue + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: mono + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-gold-win " # GROUP 3 @@ -162,7 +170,9 @@ jobs: steps: - template: trend-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile arm-lin-28-app --profile intel-load2-load " - job: GC_Intel_Windows @@ -174,7 +184,9 @@ jobs: steps: - template: gc-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app " - job: Trends_Gold_Linux @@ -186,7 +198,9 @@ jobs: steps: - template: trend-scenarios.yml parameters: - connection: ASP.NET Benchmarks Mono Queue + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: mono + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-gold-lin " # GROUP 4 @@ -200,7 +214,9 @@ jobs: steps: - template: trend-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile amd-lin-app --profile intel-load2-load " - job: Containers_Intel_Linux @@ -212,7 +228,9 @@ jobs: steps: - template: containers-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-db-db " - job: EF_Core_Intel_Windows @@ -224,7 +242,9 @@ jobs: steps: - template: efcore-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app " - job: Trends_Database_Gold_Windows @@ -252,7 +272,9 @@ jobs: steps: - template: baselines-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-db-db " - job: Baselines_Intel_Windows @@ -264,7 +286,9 @@ jobs: steps: - template: baselines-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load " - job: Baselines_Database_Arm_28_Linux @@ -276,7 +300,9 @@ jobs: steps: - template: baselines-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile arm-lin-28-app --profile amd-lin-load --profile amd-lin2-db " - job: Baselines_Database_Gold_Linux @@ -288,7 +314,9 @@ jobs: steps: - template: baselines-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Mono Queue + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: mono + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-gold-lin " # GROUP 6 @@ -302,7 +330,9 @@ jobs: steps: - template: baselines-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app --profile intel-load-load --profile intel-db-db " - job: Baselines_Intel_Linux @@ -314,7 +344,9 @@ jobs: steps: - template: baselines-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load2-load " - job: PGO_Arm_28_Linux @@ -326,7 +358,9 @@ jobs: steps: - template: pgo-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile arm-lin-28-app --profile amd-lin-load --profile amd-lin2-db " - job: Baselines_Gold_Windows @@ -338,7 +372,9 @@ jobs: steps: - template: baselines-scenarios.yml parameters: - connection: ASP.NET Benchmarks Mono Queue + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: mono + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-gold-win " # GROUP 7 @@ -352,7 +388,9 @@ jobs: steps: - template: baselines-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile amd-lin-app --profile intel-load-load --profile intel-db-db " - job: Baselines_Arm_28_Linux @@ -364,7 +402,9 @@ jobs: steps: - template: baselines-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile arm-lin-28-app --profile intel-load2-load " - job: Native_Aot_Intel_Windows @@ -376,7 +416,9 @@ jobs: steps: - template: nativeaot-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app --profile intel-lin-load --profile amd-lin2-db " - job: Baselines_Gold_Linux @@ -388,7 +430,9 @@ jobs: steps: - template: baselines-scenarios.yml parameters: - connection: ASP.NET Benchmarks Mono Queue + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: mono + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-gold-lin " # GROUP 8 @@ -402,7 +446,9 @@ jobs: steps: - template: baselines-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile amd-lin-app --profile intel-lin-load " - job: Frameworks_Intel_Linux @@ -414,7 +460,9 @@ jobs: steps: - template: frameworks-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile amd-lin2-db " - job: Grpc_Intel_Windows @@ -426,7 +474,9 @@ jobs: steps: - template: grpc-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app --profile intel-db-load " - job: Baselines_Database_Gold_Windows @@ -438,7 +488,9 @@ jobs: steps: - template: baselines-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Mono Queue + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: mono + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-gold-win " # GROUP 9 @@ -452,7 +504,9 @@ jobs: steps: - template: frameworks-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-db-db " - job: WebSockets_Intel_Windows @@ -464,7 +518,9 @@ jobs: steps: - template: websocket-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load " - job: Frameworks_Database_Arm_28_Linux @@ -476,7 +532,9 @@ jobs: steps: - template: frameworks-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile arm-lin-28-app --profile amd-lin-load --profile amd-lin2-db " - job: Frameworks_Database_Intel_Gold_Linux @@ -488,7 +546,9 @@ jobs: steps: - template: frameworks-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Mono Queue + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: mono + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-gold-lin " # GROUP 10 @@ -502,7 +562,9 @@ jobs: steps: - template: frameworks-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile amd-lin-app --profile intel-load-load --profile intel-db-db " - job: Frameworks_Arm_80_Linux @@ -514,7 +576,9 @@ jobs: steps: - template: frameworks-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile arm-lin-app --profile amd-lin-load --profile amd-lin2-db " - job: Trends_Siryn_Linux @@ -526,7 +590,9 @@ jobs: steps: - template: trend-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile siryn-lin-app --profile intel-load2-load " - job: Frameworks_Intel_Gold_Linux @@ -538,7 +604,9 @@ jobs: steps: - template: frameworks-scenarios.yml parameters: - connection: ASP.NET Benchmarks Mono Queue + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: mono + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-gold-lin " # GROUP 11 @@ -552,7 +620,9 @@ jobs: steps: - template: frameworks-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile amd-lin-app --profile amd-lin2-load --profile intel-load2-db " - job: Native_Aot_Intel_Linux @@ -564,7 +634,9 @@ jobs: steps: - template: nativeaot-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-db-db " - job: Baselines_Siryn_Linux @@ -576,7 +648,9 @@ jobs: steps: - template: baselines-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile siryn-lin-app --profile arm-lin-load " diff --git a/build/benchmarks-ci-02.yml b/build/benchmarks-ci-02.yml index 740b8b60..1adbb792 100644 --- a/build/benchmarks-ci-02.yml +++ b/build/benchmarks-ci-02.yml @@ -40,7 +40,9 @@ jobs: steps: - template: frameworks-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile arm-lin-28-app --profile intel-load2-load --profile amd-lin2-db " - job: GC_Intel_Linux @@ -52,7 +54,9 @@ jobs: steps: - template: gc-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app " - job: SslStream_Intel_Linux @@ -64,7 +68,9 @@ jobs: steps: - template: sslstream-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-load-app --profile amd-lin-load " # GROUP 2 @@ -78,7 +84,9 @@ jobs: steps: - template: pgo-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app --profile amd-lin2-load --profile intel-db-db " - job: PGO_Intel_Linux @@ -90,7 +98,9 @@ jobs: steps: - template: pgo-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile amd-lin-load --profile intel-load-db " - job: Mvc_Siryn_Linux @@ -102,7 +112,9 @@ jobs: steps: - template: mvc-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile siryn-lin-app --profile arm-lin-load --profile intel-load2-db " # GROUP 3 @@ -116,7 +128,9 @@ jobs: steps: - template: signalr-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load " - job: SignalR_Intel_Windows @@ -128,7 +142,9 @@ jobs: steps: - template: signalr-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load " - job: Blazor_Intel_Linux @@ -140,7 +156,9 @@ jobs: steps: - template: blazor-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-perflin-app --profile intel-perfload-load " # GROUP 4 @@ -154,7 +172,9 @@ jobs: steps: - template: websocket-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load " - job: Build_Intel_Linux @@ -166,7 +186,9 @@ jobs: steps: - template: build-perf-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-load2-app --profile intel-db-load " - job: Trends_Database_Arm_80_Linux @@ -178,7 +200,9 @@ jobs: steps: - template: trend-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile arm-lin-app --profile amd-lin-load --profile amd-lin2-db " # GROUP 5 @@ -192,7 +216,9 @@ jobs: steps: - template: singlefile-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load " - job: Mvc_Intel_Windows @@ -204,7 +230,9 @@ jobs: steps: - template: mvc-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load --profile intel-db-db " - job: Frameworks_Database_Arm_80_Linux @@ -216,7 +244,9 @@ jobs: steps: - template: frameworks-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile arm-lin-app --profile amd-lin-load --profile amd-lin2-db " # GROUP 6 @@ -230,7 +260,9 @@ jobs: steps: - template: mvc-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-db-db " - job: Single_File_Intel_Windows @@ -242,7 +274,9 @@ jobs: steps: - template: singlefile-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load " - job: GC_Arm_28_Linux @@ -254,7 +288,9 @@ jobs: steps: - template: gc-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile arm-lin-28-app " # GROUP 7 @@ -268,7 +304,9 @@ jobs: steps: - template: proxies-custom-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-db-db " - job: Build_Intel_Windows @@ -280,7 +318,9 @@ jobs: steps: - template: build-perf-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load " - job: Trends_Arm_80_Linux @@ -292,7 +332,9 @@ jobs: steps: - template: trend-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile arm-lin-app --profile amd-lin-load " # GROUP 8 @@ -306,7 +348,9 @@ jobs: steps: - template: proxies-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-db-db " - job: Grpc_Intel_Linux @@ -318,7 +362,9 @@ jobs: steps: - template: grpc-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-load2-app --profile amd-lin-load " - job: Baselines_Database_Siryn_Linux @@ -330,7 +376,9 @@ jobs: steps: - template: baselines-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile siryn-lin-app --profile arm-lin-load --profile amd-lin2-db " # GROUP 9 @@ -344,7 +392,9 @@ jobs: steps: - template: crossgen2-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile arm-lin-28-app --profile amd-lin-load " - job: Crossgen_Intel_Linux @@ -356,7 +406,9 @@ jobs: steps: - template: crossgen2-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load " - job: Trends_Database_Siryn_Linux @@ -368,7 +420,9 @@ jobs: steps: - template: trend-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile siryn-lin-app --profile intel-load2-load --profile intel-db-db " # GROUP 10 @@ -382,7 +436,9 @@ jobs: steps: - template: crossgen2-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app --profile intel-load-load " - job: Crossgen_Amd_Linux @@ -394,7 +450,9 @@ jobs: steps: - template: crossgen2-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine2 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile amd-lin-app --profile intel-load2-load " - job: HttpClient_Intel_Linux @@ -406,7 +464,9 @@ jobs: steps: - template: httpclient-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 3 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine3 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-lin-app --profile amd-lin2-load " # GROUP 11 @@ -420,6 +480,8 @@ jobs: steps: - template: httpclient-scenarios.yml parameters: - connection: ASP.NET Benchmarks Queue 1 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: citrine1 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile intel-win-app --profile amd-lin2-load " diff --git a/build/benchmarks-ci-azure.yml b/build/benchmarks-ci-azure.yml index 861d7378..2170b519 100644 --- a/build/benchmarks-ci-azure.yml +++ b/build/benchmarks-ci-azure.yml @@ -40,7 +40,9 @@ jobs: steps: - template: trend-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Azure Queue + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: azure + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azure-lin " - job: Trends_Database_Azure_Arm64_Linux @@ -52,7 +54,9 @@ jobs: steps: - template: trend-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Azure Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: azurearm64 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " # GROUP 2 @@ -66,7 +70,9 @@ jobs: steps: - template: trend-scenarios.yml parameters: - connection: ASP.NET Benchmarks Azure Queue + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: azure + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azure-lin " - job: Trends_Azure_Arm64_Linux @@ -78,7 +84,9 @@ jobs: steps: - template: trend-scenarios.yml parameters: - connection: ASP.NET Benchmarks Azure Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: azurearm64 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " # GROUP 3 @@ -92,7 +100,9 @@ jobs: steps: - template: baselines-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Azure Queue + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: azure + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azure-lin " - job: Baselines_Database_Azure_Arm64_Linux @@ -104,7 +114,9 @@ jobs: steps: - template: baselines-database-scenarios.yml parameters: - connection: ASP.NET Benchmarks Azure Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: azurearm64 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " # GROUP 4 @@ -118,7 +130,9 @@ jobs: steps: - template: baselines-scenarios.yml parameters: - connection: ASP.NET Benchmarks Azure Queue + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: azure + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azure-lin " - job: Baselines_Azure_Arm64_Linux @@ -130,7 +144,9 @@ jobs: steps: - template: baselines-scenarios.yml parameters: - connection: ASP.NET Benchmarks Azure Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: azurearm64 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " # GROUP 5 @@ -144,7 +160,9 @@ jobs: steps: - template: containers-scenarios.yml parameters: - connection: ASP.NET Benchmarks Azure Queue + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: azure + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azure-lin " - job: Containers_Azure_Arm64_Linux @@ -156,6 +174,8 @@ jobs: steps: - template: containers-scenarios.yml parameters: - connection: ASP.NET Benchmarks Azure Queue 2 + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: azurearm64 + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " diff --git a/build/benchmarks.matrix.01.yml b/build/benchmarks.matrix.01.yml index e9e9165f..1540e7b6 100644 --- a/build/benchmarks.matrix.01.yml +++ b/build/benchmarks.matrix.01.yml @@ -2,11 +2,11 @@ # It generates the file benchmarks.yml. See this file for instructions. queues: - - ASP.NET Benchmarks Queue 1 - - ASP.NET Benchmarks Queue 2 - - ASP.NET Benchmarks Queue 3 - - ASP.NET Benchmarks Mono Queue - + - citrine1 + - citrine2 + - citrine3 + - mono + schedule: "0 9/12 * * *" groups: diff --git a/build/benchmarks.matrix.02.yml b/build/benchmarks.matrix.02.yml index cdb4c512..725ba964 100644 --- a/build/benchmarks.matrix.02.yml +++ b/build/benchmarks.matrix.02.yml @@ -2,9 +2,10 @@ # It generates the file benchmarks.yml. See this file for instructions. queues: - - ASP.NET Benchmarks Queue 1 - - ASP.NET Benchmarks Queue 2 - - ASP.NET Benchmarks Queue 3 + - citrine1 + - citrine2 + - citrine3 + - mono schedule: "0 3/12 * * *" diff --git a/build/benchmarks.matrix.azure.yml b/build/benchmarks.matrix.azure.yml index 3614351f..a340931d 100644 --- a/build/benchmarks.matrix.azure.yml +++ b/build/benchmarks.matrix.azure.yml @@ -2,8 +2,8 @@ # It generates the file benchmarks.yml. See this file for instructions. queues: - - ASP.NET Benchmarks Azure Queue - - ASP.NET Benchmarks Azure Queue 2 + - azure + - azurearm64 schedule: "0 9/12 * * *" diff --git a/build/benchmarks.template.liquid b/build/benchmarks.template.liquid index bc4b0b66..6a04b27c 100644 --- a/build/benchmarks.template.liquid +++ b/build/benchmarks.template.liquid @@ -45,7 +45,9 @@ jobs: steps: - template: {{job.template}} parameters: - connection: {{queues[forloop.index0]}} + connection: ASPNET Benchmarks Service Bus + serviceBusQueueName: {{queues[forloop.index0]}} + serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) {%for p in job.profiles%}--profile {{p}} {% endfor %}" {% endfor %} diff --git a/build/blazor-scenarios.yml b/build/blazor-scenarios.yml index 0a70d4a3..fdab4e0b 100644 --- a/build/blazor-scenarios.yml +++ b/build/blazor-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' # Check https://github.com/dotnet/aspnetcore/issues/49713 @@ -34,12 +40,14 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() displayName: ${{ s.displayName }} timeoutInMinutes: 10 inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | @@ -50,12 +58,14 @@ steps: } - ${{ each s in parameters.lighthouseScenarios }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() displayName: ${{ s.displayName }} timeoutInMinutes: 10 inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/build-perf-scenarios.yml b/build/build-perf-scenarios.yml index 55999e10..2716a8f1 100644 --- a/build/build-perf-scenarios.yml +++ b/build/build-perf-scenarios.yml @@ -5,6 +5,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -26,12 +32,14 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() displayName: ${{ s.displayName }} timeoutInMinutes: 10 inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/containers-scenarios.yml b/build/containers-scenarios.yml index 28130ff4..10b74abb 100644 --- a/build/containers-scenarios.yml +++ b/build/containers-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -120,12 +126,14 @@ steps: - ${{ each scenario in parameters.scenarios }}: - ${{ each size in parameters.sizes }}: - ${{ each rate in parameters.rates }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() displayName: ${{ scenario.displayName }} ${{ size.displayName }} ${{ rate.displayName }} RPS timeoutInMinutes: 10 inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/crossgen2-scenarios.yml b/build/crossgen2-scenarios.yml index b69f73fd..b2fbb5f4 100644 --- a/build/crossgen2-scenarios.yml +++ b/build/crossgen2-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -37,12 +43,14 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - ${{ each p in parameters.profiles }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 displayName: "${{ s.displayName }} ${{ p.displayName }}" condition: succeededOrFailed() timeoutInMinutes: 10 inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/efcore-scenarios.yml b/build/efcore-scenarios.yml index 3e350830..9768a155 100644 --- a/build/efcore-scenarios.yml +++ b/build/efcore-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -49,12 +55,14 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 30 displayName: ${{ s.displayName }} inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/frameworks-database-scenarios.yml b/build/frameworks-database-scenarios.yml index 355b1e79..ea5bd6ce 100644 --- a/build/frameworks-database-scenarios.yml +++ b/build/frameworks-database-scenarios.yml @@ -8,6 +8,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -69,12 +75,14 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() displayName: ${{ s.displayName }} timeoutInMinutes: 10 inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/frameworks-scenarios.yml b/build/frameworks-scenarios.yml index a82d69e4..9c2dd7d6 100644 --- a/build/frameworks-scenarios.yml +++ b/build/frameworks-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -57,12 +63,14 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() displayName: ${{ s.displayName }} timeoutInMinutes: 10 inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/gc-scenarios.yml b/build/gc-scenarios.yml index a5e33f84..706ffceb 100644 --- a/build/gc-scenarios.yml +++ b/build/gc-scenarios.yml @@ -5,6 +5,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -67,12 +73,14 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 displayName: "${{ s.displayName }}" condition: succeededOrFailed() timeoutInMinutes: 20 inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/grpc-scenarios.yml b/build/grpc-scenarios.yml index 72d2ee29..4eb671b9 100644 --- a/build/grpc-scenarios.yml +++ b/build/grpc-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -87,12 +93,14 @@ steps: # h2c h2load unary to various servers - ${{ each s in parameters.h2loadscenarios }}: - ${{ each stream in parameters.connectionStreams }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() displayName: h2c ${{ s.displayName }} ${{ stream.displayName }} timeoutInMinutes: 10 inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | @@ -110,12 +118,14 @@ steps: - ${{ each protocol in parameters.protocols }}: - ${{ each stream in parameters.connectionStreams }}: - ${{ if or( not( eq(protocol.displayName, 'h3')), eq( parameters.runH3, 'true')) }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 10 displayName: ${{ protocol.displayName }} ${{ s.displayName }} ${{ callType.displayName }} ${{ payload.displayName }} ${{ stream.displayName }} inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | @@ -130,12 +140,14 @@ steps: - ${{ each callType in parameters.callTypes }}: - ${{ each payload in parameters.payloads }}: - ${{ each stream in parameters.connectionStreams }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 10 displayName: h2c ${{ s.displayName }} ${{ callType.displayName }} ${{ payload.displayName }} ${{ stream.displayName }} inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/httpclient-scenarios.yml b/build/httpclient-scenarios.yml index e820a0dd..7db10bad 100644 --- a/build/httpclient-scenarios.yml +++ b/build/httpclient-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -74,12 +80,14 @@ steps: - ${{ each version in parameters.httpVersion }}: - ${{ each ct in parameters.clientsxThreads }}: - ${{ each response in parameters.response }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 10 displayName: ${{ version.displayName }} ${{ s.displayName }} ${{ response.displayName }} ${{ ct.displayName }} inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | @@ -94,12 +102,14 @@ steps: - ${{ each version in parameters.httpVersion }}: - ${{ each ct in parameters.clientsxThreads }}: - ${{ each content in parameters.requestContent }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 10 displayName: ${{ version.displayName }} ${{ s.displayName }} ${{ content.displayName }} ${{ ct.displayName }} inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/mono-database-scenarios.yml b/build/mono-database-scenarios.yml index 62b32f4e..7192593f 100644 --- a/build/mono-database-scenarios.yml +++ b/build/mono-database-scenarios.yml @@ -5,6 +5,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -36,12 +42,14 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - ${{ each runtime in parameters.runtimes }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 displayName: "${{ s.displayName }} - ${{ runtime.displayName }}" condition: succeededOrFailed() timeoutInMinutes: 60 inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/mono-scenarios.yml b/build/mono-scenarios.yml index 28fb3ab3..98cc8a81 100644 --- a/build/mono-scenarios.yml +++ b/build/mono-scenarios.yml @@ -5,6 +5,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -44,12 +50,14 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - ${{ each runtime in parameters.runtimes }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 displayName: "${{ s.displayName }} - ${{ runtime.displayName }}" condition: succeededOrFailed() timeoutInMinutes: 60 inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/mvc-scenarios.yml b/build/mvc-scenarios.yml index c3abafbb..25b08b30 100644 --- a/build/mvc-scenarios.yml +++ b/build/mvc-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -75,12 +81,14 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() displayName: ${{ s.displayName }} timeoutInMinutes: 10 inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/nativeaot-scenarios.yml b/build/nativeaot-scenarios.yml index deeff3e5..1b22869f 100644 --- a/build/nativeaot-scenarios.yml +++ b/build/nativeaot-scenarios.yml @@ -5,6 +5,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -132,12 +138,14 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 displayName: "${{ s.displayName }}" condition: succeededOrFailed() timeoutInMinutes: 10 inputs: connectedServiceName: ${{ parameters.connection }} + serviceBusQueueName: ${{ parameters.serviceBusQueueName }} + serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true useDataContractSerializer: "false" messageBody: | diff --git a/build/pgo-scenarios.yml b/build/pgo-scenarios.yml index 9f63a2af..22651218 100644 --- a/build/pgo-scenarios.yml +++ b/build/pgo-scenarios.yml @@ -5,6 +5,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -65,7 +71,7 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - ${{ each m in parameters.modes }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 displayName: "${{ s.displayName }} ${{ m.displayName }}" condition: succeededOrFailed() timeoutInMinutes: 10 diff --git a/build/proxies-custom-scenarios.yml b/build/proxies-custom-scenarios.yml index 9d766146..8a86060b 100644 --- a/build/proxies-custom-scenarios.yml +++ b/build/proxies-custom-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: '(new Date().getUTCHours() - 7 + 24) % 24 < 13' @@ -40,7 +46,7 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - ${{ each p in parameters.proxies }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 10 displayName: ${{ p.displayName }} ${{ s.displayName }} diff --git a/build/proxies-scenarios.yml b/build/proxies-scenarios.yml index ce644bc0..3d89bb49 100644 --- a/build/proxies-scenarios.yml +++ b/build/proxies-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -140,7 +146,7 @@ steps: - ${{ each protocol in parameters.protocols }}: # doesn't (requiresServerHttps or supportsServerHttps) AND (doesn't requiresServerHttp2 or supportsServerHttp2) - ${{ if and( not( protocol.requiresGRPC), or( not( protocol.requiresHttp), s.supportsHttp), or( not( protocol.requiresServerHttps), s.supportsServerHttps), or( ne( protocol.scenarioSuffix, '-h2load'), s.supportsServerHttp2), or( not( protocol.requiresDownstreamHttp2), s.supportsDownstreamHttp2) ) }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 10 displayName: ${{ s.displayName }} ${{ payload.displayName }} ${{ protocol.displayName }} @@ -163,7 +169,7 @@ steps: - ${{ each payload in parameters.payloads }}: - ${{ each protocol in parameters.protocols }}: - ${{ if and( protocol.requiresGRPC, s.supportsGRPC, eq( payload.displayName, '0 B - 100 B - No Headers' ) ) }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 10 displayName: ${{ s.displayName }} ${{ payload.displayName }} ${{ protocol.displayName }} diff --git a/build/signalr-scenarios.yml b/build/signalr-scenarios.yml index 6517aebe..9d4fbb8b 100644 --- a/build/signalr-scenarios.yml +++ b/build/signalr-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -51,7 +57,7 @@ steps: - ${{ each s in parameters.scenarios }}: - ${{ each transport in parameters.transports }}: - ${{ each protocol in parameters.protocols }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() enabled: ${{ not( and( eq(transport.displayName, 'ServerSentEvents'), eq(protocol.displayName, 'MessagePack'))) }} displayName: ${{ s.displayName }} ${{ transport.displayName }} ${{ protocol.displayName }} diff --git a/build/singlefile-scenarios.yml b/build/singlefile-scenarios.yml index 1d4e13cf..32fc074d 100644 --- a/build/singlefile-scenarios.yml +++ b/build/singlefile-scenarios.yml @@ -5,6 +5,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -37,7 +43,7 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - ${{ each mode in parameters.modes }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 displayName: "${{ s.displayName }} - ${{ mode.displayName }}" condition: succeededOrFailed() timeoutInMinutes: 10 diff --git a/build/sslstream-scenarios.yml b/build/sslstream-scenarios.yml index 826f1b55..c2f7a6f8 100644 --- a/build/sslstream-scenarios.yml +++ b/build/sslstream-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: "" + - name: serviceBusQueueName + type: string + default: '' + - name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: "true" @@ -106,7 +112,7 @@ steps: - ${{ each version in parameters.tlsVersion }}: - ${{ each c in parameters.connections }}: - ${{ each res in parameters.tlsResume }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 10 displayName: ${{ t.displayName }} ${{ version.displayName }} ${{ s.displayName }} ${{ c.displayName }} ${{ res.displayName }} @@ -125,7 +131,7 @@ steps: - ${{ each t in parameters.quicTransport }}: - ${{ each s in parameters.handshakeScenarios }}: - ${{ each c in parameters.connections }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 10 displayName: ${{ t.displayName }} ${{ s.displayName }} ${{ c.displayName }} @@ -147,7 +153,7 @@ steps: - ${{ each recvbuf in parameters.receiveBuffers }}: - ${{ each version in parameters.tlsVersion }}: - ${{ each c in parameters.singleStreamConnections }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 10 displayName: ${{ t.displayName }} ${{ version.displayName }} ${{ s.displayName }} ${{ sendbuf.displayName }} ${{ recvbuf.displayName }} ${{ c.displayName }} @@ -168,7 +174,7 @@ steps: - ${{ each sendbuf in parameters.sendBuffers }}: - ${{ each recvbuf in parameters.receiveBuffers }}: - ${{ each c in parameters.multiplexedConnections }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() timeoutInMinutes: 10 displayName: ${{ t.displayName }} ${{ s.displayName }} ${{ sendbuf.displayName }} ${{ recvbuf.displayName }} ${{ c.displayName }} diff --git a/build/trend-database-scenarios.yml b/build/trend-database-scenarios.yml index c90bade9..5deb5e87 100644 --- a/build/trend-database-scenarios.yml +++ b/build/trend-database-scenarios.yml @@ -74,7 +74,7 @@ steps: condition: succeededOrFailed() timeoutInMinutes: 10 inputs: - azureSubscription: ${{ parameters.connection }} + connectedServiceName: ${{ parameters.connection }} serviceBusQueueName: ${{ parameters.serviceBusQueueName }} serviceBusNamespace: ${{ parameters.serviceBusNamespace }} waitForCompletion: true diff --git a/build/trend-scenarios.yml b/build/trend-scenarios.yml index a68d3117..b31377fe 100644 --- a/build/trend-scenarios.yml +++ b/build/trend-scenarios.yml @@ -5,6 +5,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -87,7 +93,7 @@ parameters: steps: - ${{ each s in parameters.scenarios }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 displayName: "${{ s.displayName }}" condition: succeededOrFailed() timeoutInMinutes: 10 diff --git a/build/websocket-scenarios.yml b/build/websocket-scenarios.yml index e9aff857..a58d2fd3 100644 --- a/build/websocket-scenarios.yml +++ b/build/websocket-scenarios.yml @@ -7,6 +7,12 @@ parameters: - name: connection type: string default: '' +- name: serviceBusQueueName + type: string + default: '' +- name: serviceBusNamespace + type: string + default: '' - name: condition type: string default: 'true' @@ -43,7 +49,7 @@ steps: - ${{ each s in parameters.scenarios }}: - ${{ each size in parameters.sizes }}: - ${{ each compress in parameters.compress }}: - - task: PublishToAzureServiceBus@1 + - task: PublishToAzureServiceBus@2 condition: succeededOrFailed() displayName: ${{ s.displayName }} ${{ size.displayName }} ${{ compress.displayName }} timeoutInMinutes: 10