diff --git a/build/azure.profile.yml b/build/azure.profile.yml index 19ed97f47..728761491 100644 --- a/build/azure.profile.yml +++ b/build/azure.profile.yml @@ -6,21 +6,21 @@ profiles: serverPort: 5000 serverAddress: 10.0.4.4 cores: 4 - jobs: + jobs: db: - endpoints: + endpoints: - http://10.0.4.6:5001 aliases: - extra application: - endpoints: + endpoints: - http://10.0.4.4:5001 variables: databaseServer: 10.0.4.6 aliases: - main load: - endpoints: + endpoints: - http://10.0.4.5:5001 aliases: - warmup @@ -31,21 +31,21 @@ profiles: serverPort: 5000 serverAddress: 10.0.4.4 cores: 4 - jobs: + jobs: db: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/azuredb aliases: - extra application: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/azureserver variables: databaseServer: 10.0.4.6 aliases: - main load: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/azureclient aliases: - warmup @@ -56,21 +56,21 @@ profiles: serverPort: 5000 serverAddress: 10.0.4.12 cores: 4 - jobs: + jobs: db: - endpoints: + endpoints: - http://10.0.4.6:5001 aliases: - extra application: - endpoints: + endpoints: - http://10.0.4.12:5001 variables: databaseServer: 10.0.4.6 aliases: - main load: - endpoints: + endpoints: - http://10.0.4.13:5001 # idna-amd-lin aliases: - warmup @@ -81,21 +81,21 @@ profiles: serverPort: 5000 serverAddress: 10.0.4.12 cores: 4 - jobs: + jobs: db: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/azuredb aliases: - extra application: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/idnaintellin variables: databaseServer: 10.0.4.6 aliases: - main load: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/idnaamdlin aliases: - warmup @@ -106,21 +106,21 @@ profiles: serverPort: 5000 serverAddress: 10.0.4.13 cores: 4 - jobs: + jobs: db: - endpoints: + endpoints: - http://10.0.4.6:5001 aliases: - extra application: - endpoints: + endpoints: - http://10.0.4.13:5001 variables: databaseServer: 10.0.4.6 aliases: - main load: - endpoints: + endpoints: - http://10.0.4.12:5001 # idna-intel-lin aliases: - warmup @@ -131,21 +131,21 @@ profiles: serverPort: 5000 serverAddress: 10.0.4.13 cores: 4 - jobs: + jobs: db: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/azuredb aliases: - extra application: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/idnaamdlin variables: databaseServer: 10.0.4.6 aliases: - main load: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/idnaintellin aliases: - warmup @@ -156,21 +156,21 @@ profiles: serverPort: 5000 serverAddress: 10.0.4.14 cores: 4 - jobs: + jobs: db: - endpoints: + endpoints: - http://10.0.4.6:5001 aliases: - extra application: - endpoints: + endpoints: - http://10.0.4.14:5001 variables: databaseServer: 10.0.4.6 aliases: - main load: - endpoints: + endpoints: - http://10.0.4.13:5001 # idna-amd-lin aliases: - warmup @@ -181,21 +181,21 @@ profiles: serverPort: 5000 serverAddress: 10.0.4.14 cores: 4 - jobs: + jobs: db: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/azuredb aliases: - extra application: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/idnaintelwin variables: databaseServer: 10.0.4.6 aliases: - main load: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/idnaamdlin aliases: - warmup @@ -206,21 +206,21 @@ profiles: serverPort: 5000 serverAddress: 10.0.4.15 cores: 4 - jobs: + jobs: db: - endpoints: + endpoints: - http://10.0.4.6:5001 aliases: - extra application: - endpoints: + endpoints: - http://10.0.4.15:5001 variables: databaseServer: 10.0.4.6 aliases: - main load: - endpoints: + endpoints: - http://10.0.4.12:5001 # idna-intel-lin aliases: - warmup @@ -231,46 +231,46 @@ profiles: serverPort: 5000 serverAddress: 10.0.4.15 cores: 4 - jobs: + jobs: db: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/azuredb aliases: - extra application: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/idnaamdwin variables: databaseServer: 10.0.4.6 aliases: - main load: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/idnaintellin aliases: - warmup - secondary - + aspnet-azurearm64-lin: variables: serverPort: 5000 serverAddress: 10.0.4.7 cores: 4 - jobs: + jobs: db: - endpoints: + endpoints: - http://10.0.4.9:5001 aliases: - extra application: - endpoints: + endpoints: - http://10.0.4.7:5001 variables: databaseServer: 10.0.4.9 aliases: - main load: - endpoints: + endpoints: - http://10.0.4.8:5001 aliases: - warmup @@ -281,72 +281,22 @@ profiles: serverPort: 5000 serverAddress: 10.0.4.7 cores: 4 - jobs: + jobs: db: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/azurearm64db aliases: - extra application: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/azurearm64server variables: databaseServer: 10.0.4.9 aliases: - main load: - endpoints: + endpoints: - https://aspnetperf.servicebus.windows.net/azurearm64client aliases: - warmup - secondary - - cobalt-cloud-lin: - variables: - serverPort: 5000 - serverAddress: 10.2.2.15 - cores: 4 - jobs: - db: - endpoints: - - http://10.2.2.14:5001 - aliases: - - extra - application: - endpoints: - - http://10.2.2.15:5001 - variables: - databaseServer: 10.2.2.14 - aliases: - - main - load: - endpoints: - - http://10.2.2.13:5001 - aliases: - - warmup - - secondary - - cobalt-cloud-lin-relay: - variables: - serverPort: 5000 - serverAddress: 10.2.2.15 - cores: 4 - jobs: - db: - endpoints: - - https://aspnetperf.servicebus.windows.net/cobaltcloudlindb - aliases: - - extra - application: - endpoints: - - https://aspnetperf.servicebus.windows.net/cobaltcloudlinserver - variables: - databaseServer: 10.2.2.14 - aliases: - - main - load: - endpoints: - - https://aspnetperf.servicebus.windows.net/cobaltcloudlinclient - aliases: - - warmup - - secondary diff --git a/build/benchmarks-ci-azure.yml b/build/benchmarks-ci-azure.yml index 21c96daaf..f05121bf3 100644 --- a/build/benchmarks-ci-azure.yml +++ b/build/benchmarks-ci-azure.yml @@ -59,27 +59,13 @@ jobs: serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " -- job: Trends_Database_Cobalt_Cloud_Linux - displayName: 1- Trends Database Cobalt Cloud Linux - pool: server - timeoutInMinutes: 120 - dependsOn: [] - condition: succeededOrFailed() - steps: - - template: trend-database-scenarios.yml - parameters: - connection: ASPNET Benchmarks Service Bus - serviceBusQueueName: cobaltcloud - serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin " - # GROUP 2 - job: Trends_Azure_Linux displayName: 2- Trends Azure Linux pool: server timeoutInMinutes: 120 - dependsOn: [Trends_Database_Azure_Linux, Trends_Database_Azure_Arm64_Linux, Trends_Database_Cobalt_Cloud_Linux] + dependsOn: [Trends_Database_Azure_Linux, Trends_Database_Azure_Arm64_Linux] condition: succeededOrFailed() steps: - template: trend-scenarios.yml @@ -93,7 +79,7 @@ jobs: displayName: 2- Trends Azure Arm64 Linux pool: server timeoutInMinutes: 120 - dependsOn: [Trends_Database_Azure_Linux, Trends_Database_Azure_Arm64_Linux, Trends_Database_Cobalt_Cloud_Linux] + dependsOn: [Trends_Database_Azure_Linux, Trends_Database_Azure_Arm64_Linux] condition: succeededOrFailed() steps: - template: trend-scenarios.yml @@ -103,27 +89,13 @@ jobs: serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " -- job: Trends_Cobalt_Cloud_Linux - displayName: 2- Trends Cobalt Cloud Linux - pool: server - timeoutInMinutes: 120 - dependsOn: [Trends_Database_Azure_Linux, Trends_Database_Azure_Arm64_Linux, Trends_Database_Cobalt_Cloud_Linux] - condition: succeededOrFailed() - steps: - - template: trend-scenarios.yml - parameters: - connection: ASPNET Benchmarks Service Bus - serviceBusQueueName: cobaltcloud - serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin " - # GROUP 3 - job: Baselines_Database_Azure_Linux displayName: 3- Baselines Database Azure Linux pool: server timeoutInMinutes: 120 - dependsOn: [Trends_Azure_Linux, Trends_Azure_Arm64_Linux, Trends_Cobalt_Cloud_Linux] + dependsOn: [Trends_Azure_Linux, Trends_Azure_Arm64_Linux] condition: succeededOrFailed() steps: - template: baselines-database-scenarios.yml @@ -137,7 +109,7 @@ jobs: displayName: 3- Baselines Database Azure Arm64 Linux pool: server timeoutInMinutes: 120 - dependsOn: [Trends_Azure_Linux, Trends_Azure_Arm64_Linux, Trends_Cobalt_Cloud_Linux] + dependsOn: [Trends_Azure_Linux, Trends_Azure_Arm64_Linux] condition: succeededOrFailed() steps: - template: baselines-database-scenarios.yml @@ -147,27 +119,13 @@ jobs: serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " -- job: Baselines_Database_Cobalt_Cloud_Linux - displayName: 3- Baselines Database Cobalt Cloud Linux - pool: server - timeoutInMinutes: 120 - dependsOn: [Trends_Azure_Linux, Trends_Azure_Arm64_Linux, Trends_Cobalt_Cloud_Linux] - condition: succeededOrFailed() - steps: - - template: baselines-database-scenarios.yml - parameters: - connection: ASPNET Benchmarks Service Bus - serviceBusQueueName: cobaltcloud - serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin " - # GROUP 4 - job: Baselines_Azure_Linux displayName: 4- Baselines Azure Linux pool: server timeoutInMinutes: 120 - dependsOn: [Baselines_Database_Azure_Linux, Baselines_Database_Azure_Arm64_Linux, Baselines_Database_Cobalt_Cloud_Linux] + dependsOn: [Baselines_Database_Azure_Linux, Baselines_Database_Azure_Arm64_Linux] condition: succeededOrFailed() steps: - template: baselines-scenarios.yml @@ -181,7 +139,7 @@ jobs: displayName: 4- Baselines Azure Arm64 Linux pool: server timeoutInMinutes: 120 - dependsOn: [Baselines_Database_Azure_Linux, Baselines_Database_Azure_Arm64_Linux, Baselines_Database_Cobalt_Cloud_Linux] + dependsOn: [Baselines_Database_Azure_Linux, Baselines_Database_Azure_Arm64_Linux] condition: succeededOrFailed() steps: - template: baselines-scenarios.yml @@ -191,27 +149,13 @@ jobs: serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " -- job: Baselines_Cobalt_Cloud_Linux - displayName: 4- Baselines Cobalt Cloud Linux - pool: server - timeoutInMinutes: 120 - dependsOn: [Baselines_Database_Azure_Linux, Baselines_Database_Azure_Arm64_Linux, Baselines_Database_Cobalt_Cloud_Linux] - condition: succeededOrFailed() - steps: - - template: baselines-scenarios.yml - parameters: - connection: ASPNET Benchmarks Service Bus - serviceBusQueueName: cobaltcloud - serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin " - # GROUP 5 - job: Containers_Azure_Intel_Linux displayName: 5- Containers Azure Intel Linux pool: server timeoutInMinutes: 120 - dependsOn: [Baselines_Azure_Linux, Baselines_Azure_Arm64_Linux, Baselines_Cobalt_Cloud_Linux] + dependsOn: [Baselines_Azure_Linux, Baselines_Azure_Arm64_Linux] condition: succeededOrFailed() steps: - template: containers-scenarios.yml @@ -225,7 +169,7 @@ jobs: displayName: 5- Containers Azure Arm64 Linux pool: server timeoutInMinutes: 120 - dependsOn: [Baselines_Azure_Linux, Baselines_Azure_Arm64_Linux, Baselines_Cobalt_Cloud_Linux] + dependsOn: [Baselines_Azure_Linux, Baselines_Azure_Arm64_Linux] condition: succeededOrFailed() steps: - template: containers-scenarios.yml @@ -235,27 +179,13 @@ jobs: serviceBusNamespace: aspnetbenchmarks arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " -- job: Containers_Cobalt_Cloud_Linux - displayName: 5- Containers Cobalt Cloud Linux - pool: server - timeoutInMinutes: 120 - dependsOn: [Baselines_Azure_Linux, Baselines_Azure_Arm64_Linux, Baselines_Cobalt_Cloud_Linux] - condition: succeededOrFailed() - steps: - - template: containers-scenarios.yml - parameters: - connection: ASPNET Benchmarks Service Bus - serviceBusQueueName: cobaltcloud - serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin " - # GROUP 6 - job: IDNA_Azure_Amd_Linux displayName: 6- IDNA Azure Amd Linux pool: server timeoutInMinutes: 120 - dependsOn: [Containers_Azure_Intel_Linux, Containers_Azure_Arm64_Linux, Containers_Cobalt_Cloud_Linux] + dependsOn: [Containers_Azure_Intel_Linux, Containers_Azure_Arm64_Linux] condition: succeededOrFailed() steps: - template: trend-scenarios.yml diff --git a/build/benchmarks.matrix.azure.yml b/build/benchmarks.matrix.azure.yml index 11a6751c3..130f6c24d 100644 --- a/build/benchmarks.matrix.azure.yml +++ b/build/benchmarks.matrix.azure.yml @@ -4,7 +4,6 @@ queues: - azure - azurearm64 - - cobaltcloud schedule: "0 9/12 * * *" @@ -22,11 +21,6 @@ groups: profiles: - aspnet-azurearm64-lin - - name: Trends Database Cobalt Cloud Linux - template: trend-database-scenarios.yml - profiles: - - cobalt-cloud-lin - - jobs: - name: Trends Azure Linux @@ -39,11 +33,6 @@ groups: profiles: - aspnet-azurearm64-lin - - name: Trends Cobalt Cloud Linux - template: trend-scenarios.yml - profiles: - - cobalt-cloud-lin - - jobs: - name: Baselines Database Azure Linux @@ -56,11 +45,6 @@ groups: profiles: - aspnet-azurearm64-lin - - name: Baselines Database Cobalt Cloud Linux - template: baselines-database-scenarios.yml - profiles: - - cobalt-cloud-lin - - jobs: - name: Baselines Azure Linux @@ -72,11 +56,6 @@ groups: template: baselines-scenarios.yml profiles: - aspnet-azurearm64-lin - - - name: Baselines Cobalt Cloud Linux - template: baselines-scenarios.yml - profiles: - - cobalt-cloud-lin - jobs: @@ -90,11 +69,6 @@ groups: profiles: - aspnet-azurearm64-lin - - name: Containers Cobalt Cloud Linux - template: containers-scenarios.yml - profiles: - - cobalt-cloud-lin - - jobs: - name: IDNA Azure Amd Linux