From 3d5ee7c701c4c165e84fac76a764d2abda7bb4a6 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 22 Jul 2025 15:58:39 -0700 Subject: [PATCH 1/9] Add profiles for individual Azure CI setups, add json configuration for Azure CI runs, and added the machines to use the profiles for the Azure CI runs. --- build/azure.profile.yml | 497 ++++++++++++++++++++++++++++++++- build/benchmarks_ci_azure.json | 307 ++++++++++++++++++++ 2 files changed, 803 insertions(+), 1 deletion(-) create mode 100644 build/benchmarks_ci_azure.json diff --git a/build/azure.profile.yml b/build/azure.profile.yml index c1ffdc428..9668595d1 100644 --- a/build/azure.profile.yml +++ b/build/azure.profile.yml @@ -399,4 +399,499 @@ profiles: - https://aspnetperf.servicebus.windows.net/cobaltcloudlinclient aliases: - warmup - - secondary \ No newline at end of file + - secondary + + # Add individual machine profiles for azure-arm64-db similar to ci.profile.yml + azure-arm64-db-app: + variables: + serverAddress: 10.0.4.9 + cores: TODO + agents: + application: + endpoints: + - http://10.0.4.9:5001 + aliases: + - main + + azure-arm64-db-db: + variables: + databaseServer: 10.0.4.9 + downstreamAddress: 10.0.4.9 + agents: + db: + endpoints: + - http://10.0.4.9:5001 + aliases: + - downstream + - extra + + azure-arm64-db-load: + variables: + secondaryAddress: 10.0.4.9 + agents: + load: + endpoints: + - http://10.0.4.9:5001 + aliases: + - warmup + - secondary + + # Individual machine profiles for azure-arm64-client + azure-arm64-client-app: + variables: + serverAddress: 10.0.4.8 + cores: TODO + agents: + application: + endpoints: + - http://10.0.4.8:5001 + aliases: + - main + + azure-arm64-client-db: + variables: + databaseServer: 10.0.4.8 + downstreamAddress: 10.0.4.8 + agents: + db: + endpoints: + - http://10.0.4.8:5001 + aliases: + - downstream + - extra + + azure-arm64-client-load: + variables: + secondaryAddress: 10.0.4.8 + agents: + load: + endpoints: + - http://10.0.4.8:5001 + aliases: + - warmup + - secondary + + # Individual machine profiles for azure-arm64-server + azure-arm64-server-app: + variables: + serverAddress: 10.0.4.7 + cores: TODO + agents: + application: + endpoints: + - http://10.0.4.7:5001 + aliases: + - main + + azure-arm64-server-db: + variables: + databaseServer: 10.0.4.7 + downstreamAddress: 10.0.4.7 + agents: + db: + endpoints: + - http://10.0.4.7:5001 + aliases: + - downstream + - extra + + azure-arm64-server-load: + variables: + secondaryAddress: 10.0.4.7 + agents: + load: + endpoints: + - http://10.0.4.7:5001 + aliases: + - warmup + - secondary + + # Individual machine profiles for azure-client + azure-client-app: + variables: + serverAddress: 10.0.4.5 + cores: TODO + agents: + application: + endpoints: + - http://10.0.4.5:5001 + aliases: + - main + + azure-client-db: + variables: + databaseServer: 10.0.4.5 + downstreamAddress: 10.0.4.5 + agents: + db: + endpoints: + - http://10.0.4.5:5001 + aliases: + - downstream + - extra + + azure-client-load: + variables: + secondaryAddress: 10.0.4.5 + agents: + load: + endpoints: + - http://10.0.4.5:5001 + aliases: + - warmup + - secondary + + # Individual machine profiles for azure-db + azure-db-app: + variables: + serverAddress: 10.0.4.6 + cores: TODO + agents: + application: + endpoints: + - http://10.0.4.6:5001 + aliases: + - main + + azure-db-db: + variables: + databaseServer: 10.0.4.6 + downstreamAddress: 10.0.4.6 + agents: + db: + endpoints: + - http://10.0.4.6:5001 + aliases: + - downstream + - extra + + azure-db-load: + variables: + secondaryAddress: 10.0.4.6 + agents: + load: + endpoints: + - http://10.0.4.6:5001 + aliases: + - warmup + - secondary + + # Individual machine profiles for azure-server + azure-server-app: + variables: + serverAddress: 10.0.4.4 + cores: TODO + agents: + application: + endpoints: + - http://10.0.4.4:5001 + aliases: + - main + + azure-server-db: + variables: + databaseServer: 10.0.4.4 + downstreamAddress: 10.0.4.4 + agents: + db: + endpoints: + - http://10.0.4.4:5001 + aliases: + - downstream + - extra + + azure-server-load: + variables: + secondaryAddress: 10.0.4.4 + agents: + load: + endpoints: + - http://10.0.4.4:5001 + aliases: + - warmup + - secondary + + # Individual machine profiles for idna-amd-lin + idna-amd-lin-app: + variables: + serverAddress: 10.0.4.13 + cores: TODO + agents: + application: + endpoints: + - http://10.0.4.13:5001 + aliases: + - main + + idna-amd-lin-db: + variables: + databaseServer: 10.0.4.13 + downstreamAddress: 10.0.4.13 + agents: + db: + endpoints: + - http://10.0.4.13:5001 + aliases: + - downstream + - extra + + idna-amd-lin-load: + variables: + secondaryAddress: 10.0.4.13 + agents: + load: + endpoints: + - http://10.0.4.13:5001 + aliases: + - warmup + - secondary + + # Individual machine profiles for idna-amd-win + idna-amd-win-app: + variables: + serverAddress: 10.0.4.15 + cores: TODO + agents: + application: + endpoints: + - http://10.0.4.15:5001 + aliases: + - main + + idna-amd-win-db: + variables: + databaseServer: 10.0.4.15 + downstreamAddress: 10.0.4.15 + agents: + db: + endpoints: + - http://10.0.4.15:5001 + aliases: + - downstream + - extra + + idna-amd-win-load: + variables: + secondaryAddress: 10.0.4.15 + agents: + load: + endpoints: + - http://10.0.4.15:5001 + aliases: + - warmup + - secondary + + # Individual machine profiles for idna-intel-lin + idna-intel-lin-app: + variables: + serverAddress: 10.0.4.12 + cores: TODO + agents: + application: + endpoints: + - http://10.0.4.12:5001 + aliases: + - main + + idna-intel-lin-db: + variables: + databaseServer: 10.0.4.12 + downstreamAddress: 10.0.4.12 + agents: + db: + endpoints: + - http://10.0.4.12:5001 + aliases: + - downstream + - extra + + idna-intel-lin-load: + variables: + secondaryAddress: 10.0.4.12 + agents: + load: + endpoints: + - http://10.0.4.12:5001 + aliases: + - warmup + - secondary + + # Individual machine profiles for idna-intel-win + idna-intel-win-app: + variables: + serverAddress: 10.0.4.14 + cores: TODO + agents: + application: + endpoints: + - http://10.0.4.14:5001 + aliases: + - main + + idna-intel-win-db: + variables: + databaseServer: 10.0.4.14 + downstreamAddress: 10.0.4.14 + agents: + db: + endpoints: + - http://10.0.4.14:5001 + aliases: + - downstream + - extra + + idna-intel-win-load: + variables: + secondaryAddress: 10.0.4.14 + agents: + load: + endpoints: + - http://10.0.4.14:5001 + aliases: + - warmup + - secondary + + ############################################# + # # + # EAST US 2 MACHINES # + # # + ############################################# + # Individual machine profiles for cobalt-cloud-lin-client + cobalt-cloud-lin-client-app: + variables: + serverAddress: 10.2.2.13 + cores: TODO + agents: + application: + endpoints: + - http://10.2.2.13:5001 + aliases: + - main + + cobalt-cloud-lin-client-db: + variables: + databaseServer: 10.2.2.13 + downstreamAddress: 10.2.2.13 + agents: + db: + endpoints: + - http://10.2.2.13:5001 + aliases: + - downstream + - extra + + cobalt-cloud-lin-client-load: + variables: + secondaryAddress: 10.2.2.13 + agents: + load: + endpoints: + - http://10.2.2.13:5001 + aliases: + - warmup + - secondary + + # Individual machine profiles for cobalt-cloud-lin-db + cobalt-cloud-lin-db-app: + variables: + serverAddress: 10.2.2.14 + cores: TODO + agents: + application: + endpoints: + - http://10.2.2.14:5001 + aliases: + - main + + cobalt-cloud-lin-db-db: + variables: + databaseServer: 10.2.2.14 + downstreamAddress: 10.2.2.14 + agents: + db: + endpoints: + - http://10.2.2.14:5001 + aliases: + - downstream + - extra + + cobalt-cloud-lin-db-load: + variables: + secondaryAddress: 10.2.2.14 + agents: + load: + endpoints: + - http://10.2.2.14:5001 + aliases: + - warmup + - secondary + + # Individual machine profiles for cobalt-cloud-lin-server + cobalt-cloud-lin-server-app: + variables: + serverAddress: 10.2.2.15 + cores: TODO + agents: + application: + endpoints: + - http://10.2.2.15:5001 + aliases: + - main + + cobalt-cloud-lin-server-db: + variables: + databaseServer: 10.2.2.15 + downstreamAddress: 10.2.2.15 + agents: + db: + endpoints: + - http://10.2.2.15:5001 + aliases: + - downstream + - extra + + cobalt-cloud-lin-server-load: + variables: + secondaryAddress: 10.2.2.15 + agents: + load: + endpoints: + - http://10.2.2.15:5001 + aliases: + - warmup + - secondary + + # Individual machine profiles for cobalt-cloud-lin-server-azure-linux3 + cobalt-cloud-lin-server-azure-linux3-app: + variables: + serverAddress: 10.2.2.16 + cores: TODO + agents: + application: + endpoints: + - http://10.2.2.16:5001 + aliases: + - main + + cobalt-cloud-lin-server-azure-linux3-db: + variables: + databaseServer: 10.2.2.16 + downstreamAddress: 10.2.2.16 + agents: + db: + endpoints: + - http://10.2.2.16:5001 + aliases: + - downstream + - extra + + cobalt-cloud-lin-server-azure-linux3-load: + variables: + secondaryAddress: 10.2.2.16 + agents: + load: + endpoints: + - http://10.2.2.16:5001 + aliases: + - warmup + - secondary diff --git a/build/benchmarks_ci_azure.json b/build/benchmarks_ci_azure.json new file mode 100644 index 000000000..483d0cee6 --- /dev/null +++ b/build/benchmarks_ci_azure.json @@ -0,0 +1,307 @@ +{ + "metadata": { + "name": "Azure CI Benchmarks Configuration", + "description": "Combined machines and scenarios for continuous integration benchmarks on Azure", + "version": "1.0", + "schedule": "0 9/12 * * *", + "queues": [ + "azure", + "azurearm64" + ], + "yaml_generation": { + "target_yaml_count": 2, + "schedule_offset_hours": 6 + } + }, + "machines": [ + { + "name": "azure-arm64-db", + "capabilities": { + "db": { + "priority": 1, + "profiles": [ + "azure-arm64-db-db" + ], + "default_profile": "azure-arm64-db-db" + }, + "load": { + "priority": 2, + "profiles": [ + "azure-arm64-db-load" + ], + "default_profile": "azure-arm64-db-load" + }, + "sut": { + "priority": 3, + "profiles": [ + "azure-arm64-db-app" + ], + "default_profile": "azure-arm64-db-app" + } + }, + "preferred_partners": [] + }, + { + "name": "azure-arm64-client", + "capabilities": { + "load": { + "priority": 1, + "profiles": [ + "azure-arm64-client-load" + ], + "default_profile": "azure-arm64-client-load" + }, + "sut": { + "priority": 2, + "profiles": [ + "azure-arm64-client-app" + ], + "default_profile": "azure-arm64-client-app" + }, + "db": { + "priority": 3, + "profiles": [ + "azure-arm64-client-db" + ], + "default_profile": "azure-arm64-client-db" + } + }, + "preferred_partners": [] + }, + { + "name": "azure-arm64-server", + "capabilities": { + "sut": { + "priority": 1, + "profiles": [ + "azure-arm64-server-app" + ], + "default_profile": "azure-arm64-server-app" + }, + "load": { + "priority": 2, + "profiles": [ + "azure-arm64-server-load" + ], + "default_profile": "azure-arm64-server-load" + }, + "db": { + "priority": 3, + "profiles": [ + "azure-arm64-server-db" + ], + "default_profile": "azure-arm64-server-db" + } + }, + "preferred_partners": [ + "azure-arm64-client", + "azure-arm64-db" + ] + }, + { + "name": "azure-client", + "capabilities": { + "load": { + "priority": 1, + "profiles": [ + "azure-client-load" + ], + "default_profile": "azure-client-load" + }, + "sut": { + "priority": 2, + "profiles": [ + "azure-client-app" + ], + "default_profile": "azure-client-app" + }, + "db": { + "priority": 3, + "profiles": [ + "azure-client-db" + ], + "default_profile": "azure-client-db" + } + }, + "preferred_partners": [] + }, + { + "name": "azure-db", + "capabilities": { + "db": { + "priority": 1, + "profiles": [ + "azure-db-db" + ], + "default_profile": "azure-db-db" + }, + "sut": { + "priority": 2, + "profiles": [ + "azure-db-app" + ], + "default_profile": "azure-db-app" + }, + "load": { + "priority": 3, + "profiles": [ + "azure-db-load" + ], + "default_profile": "azure-db-load" + } + }, + "preferred_partners": [] + }, + { + "name": "azure-server", + "capabilities": { + "sut": { + "priority": 1, + "profiles": [ + "azure-server-app" + ], + "default_profile": "azure-server-app" + }, + "load": { + "priority": 2, + "profiles": [ + "azure-server-load" + ], + "default_profile": "azure-server-load" + }, + "db": { + "priority": 3, + "profiles": [ + "azure-server-db" + ], + "default_profile": "azure-server-db" + } + }, + "preferred_partners": [ + "azure-client", + "azure-db" + ] + }, + { + "name": "idna-amd-lin", + "capabilities": { + "sut": { + "priority": 1, + "profiles": [ + "idna-amd-lin-app" + ], + "default_profile": "idna-amd-lin-app" + }, + "load": { + "priority": 2, + "profiles": [ + "idna-amd-lin-load" + ], + "default_profile": "idna-amd-lin-load" + }, + "db": { + "priority": 3, + "profiles": [ + "idna-amd-lin-db" + ], + "default_profile": "idna-amd-lin-db" + } + }, + "preferred_partners": [ + "idna-intel-lin", + "azure-db" + ] + }, + { + "name": "idna-amd-win", + "capabilities": { + "sut": { + "priority": 1, + "profiles": [ + "idna-amd-win-app" + ], + "default_profile": "idna-amd-win-app" + }, + "load": { + "priority": 2, + "profiles": [ + "idna-amd-win-load" + ], + "default_profile": "idna-amd-win-load" + }, + "db": { + "priority": 3, + "profiles": [ + "idna-amd-win-db" + ], + "default_profile": "idna-amd-win-db" + } + }, + "preferred_partners": [ + "idna-amd-lin", + "azure-db" + ] + }, + { + "name": "idna-intel-lin", + "capabilities": { + "sut": { + "priority": 1, + "profiles": [ + "idna-intel-lin-app" + ], + "default_profile": "idna-intel-lin-app" + }, + "load": { + "priority": 2, + "profiles": [ + "idna-intel-lin-load" + ], + "default_profile": "idna-intel-lin-load" + }, + "db": { + "priority": 3, + "profiles": [ + "idna-intel-lin-db" + ], + "default_profile": "idna-intel-lin-db" + } + }, + "preferred_partners": [ + "idna-amd-lin", + "azure-db" + ] + }, + { + "name": "idna-intel-win", + "capabilities": { + "sut": { + "priority": 1, + "profiles": [ + "idna-intel-win-app" + ], + "default_profile": "idna-intel-win-app" + }, + "load": { + "priority": 2, + "profiles": [ + "idna-intel-win-load" + ], + "default_profile": "idna-intel-win-load" + }, + "db": { + "priority": 3, + "profiles": [ + "idna-intel-win-db" + ], + "default_profile": "idna-intel-win-db" + } + }, + "preferred_partners": [ + "idna-amd-lin", + "azure-db" + ] + } + ], + "scenarios": [] +} \ No newline at end of file From 1e0d6e0c53ad709d4ee4b60bb8704224d5542cc0 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 22 Jul 2025 16:14:41 -0700 Subject: [PATCH 2/9] Update the cores to the actual numbers and names of the profiles to match the azure vm names. --- build/azure.profile.yml | 76 ++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/build/azure.profile.yml b/build/azure.profile.yml index 9668595d1..41dcf7697 100644 --- a/build/azure.profile.yml +++ b/build/azure.profile.yml @@ -401,11 +401,11 @@ profiles: - warmup - secondary - # Add individual machine profiles for azure-arm64-db similar to ci.profile.yml - azure-arm64-db-app: + # Add individual machine profiles for azure-db similar to ci.profile.yml + azure-db-app: # azurearm64db variables: serverAddress: 10.0.4.9 - cores: TODO + cores: 4 agents: application: endpoints: @@ -413,7 +413,7 @@ profiles: aliases: - main - azure-arm64-db-db: + azure-db-db: variables: databaseServer: 10.0.4.9 downstreamAddress: 10.0.4.9 @@ -425,7 +425,7 @@ profiles: - downstream - extra - azure-arm64-db-load: + azure-db-load: variables: secondaryAddress: 10.0.4.9 agents: @@ -436,11 +436,11 @@ profiles: - warmup - secondary - # Individual machine profiles for azure-arm64-client - azure-arm64-client-app: + # Individual machine profiles for azure-client + azure-client-app: # azurearm64client variables: serverAddress: 10.0.4.8 - cores: TODO + cores: 4 agents: application: endpoints: @@ -448,7 +448,7 @@ profiles: aliases: - main - azure-arm64-client-db: + azure-client-db: variables: databaseServer: 10.0.4.8 downstreamAddress: 10.0.4.8 @@ -460,7 +460,7 @@ profiles: - downstream - extra - azure-arm64-client-load: + azure-client-load: variables: secondaryAddress: 10.0.4.8 agents: @@ -471,11 +471,11 @@ profiles: - warmup - secondary - # Individual machine profiles for azure-arm64-server - azure-arm64-server-app: + # Individual machine profiles for azure-server-arm64 + azure-server-arm64-app: # azurearm64server variables: serverAddress: 10.0.4.7 - cores: TODO + cores: 4 agents: application: endpoints: @@ -483,7 +483,7 @@ profiles: aliases: - main - azure-arm64-server-db: + azure-server-arm64-db: variables: databaseServer: 10.0.4.7 downstreamAddress: 10.0.4.7 @@ -495,7 +495,7 @@ profiles: - downstream - extra - azure-arm64-server-load: + azure-server-arm64-load: variables: secondaryAddress: 10.0.4.7 agents: @@ -506,11 +506,11 @@ profiles: - warmup - secondary - # Individual machine profiles for azure-client - azure-client-app: + # Individual machine profiles for azure2-client + azure2-client-app: variables: serverAddress: 10.0.4.5 - cores: TODO + cores: 2 agents: application: endpoints: @@ -518,7 +518,7 @@ profiles: aliases: - main - azure-client-db: + azure2-client-db: variables: databaseServer: 10.0.4.5 downstreamAddress: 10.0.4.5 @@ -530,7 +530,7 @@ profiles: - downstream - extra - azure-client-load: + azure2-client-load: variables: secondaryAddress: 10.0.4.5 agents: @@ -541,11 +541,11 @@ profiles: - warmup - secondary - # Individual machine profiles for azure-db - azure-db-app: + # Individual machine profiles for azure2-db + azure2-db-app: variables: serverAddress: 10.0.4.6 - cores: TODO + cores: 2 agents: application: endpoints: @@ -553,7 +553,7 @@ profiles: aliases: - main - azure-db-db: + azure2-db-db: variables: databaseServer: 10.0.4.6 downstreamAddress: 10.0.4.6 @@ -565,7 +565,7 @@ profiles: - downstream - extra - azure-db-load: + azure2-db-load: variables: secondaryAddress: 10.0.4.6 agents: @@ -576,11 +576,11 @@ profiles: - warmup - secondary - # Individual machine profiles for azure-server - azure-server-app: + # Individual machine profiles for azure2-server-amd64 + azure2-server-amd64-app: variables: serverAddress: 10.0.4.4 - cores: TODO + cores: 4 agents: application: endpoints: @@ -588,7 +588,7 @@ profiles: aliases: - main - azure-server-db: + azure2-server-amd64-db: variables: databaseServer: 10.0.4.4 downstreamAddress: 10.0.4.4 @@ -600,7 +600,7 @@ profiles: - downstream - extra - azure-server-load: + azure2-server-amd64-load: variables: secondaryAddress: 10.0.4.4 agents: @@ -615,7 +615,7 @@ profiles: idna-amd-lin-app: variables: serverAddress: 10.0.4.13 - cores: TODO + cores: 4 agents: application: endpoints: @@ -650,7 +650,7 @@ profiles: idna-amd-win-app: variables: serverAddress: 10.0.4.15 - cores: TODO + cores: 4 agents: application: endpoints: @@ -685,7 +685,7 @@ profiles: idna-intel-lin-app: variables: serverAddress: 10.0.4.12 - cores: TODO + cores: 4 agents: application: endpoints: @@ -720,7 +720,7 @@ profiles: idna-intel-win-app: variables: serverAddress: 10.0.4.14 - cores: TODO + cores: 4 agents: application: endpoints: @@ -760,7 +760,7 @@ profiles: cobalt-cloud-lin-client-app: variables: serverAddress: 10.2.2.13 - cores: TODO + cores: 16 agents: application: endpoints: @@ -795,7 +795,7 @@ profiles: cobalt-cloud-lin-db-app: variables: serverAddress: 10.2.2.14 - cores: TODO + cores: 16 agents: application: endpoints: @@ -830,7 +830,7 @@ profiles: cobalt-cloud-lin-server-app: variables: serverAddress: 10.2.2.15 - cores: TODO + cores: 16 agents: application: endpoints: @@ -865,7 +865,7 @@ profiles: cobalt-cloud-lin-server-azure-linux3-app: variables: serverAddress: 10.2.2.16 - cores: TODO + cores: 16 agents: application: endpoints: From 9d418ae802524b0a6a8a54e459924021687280b0 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 22 Jul 2025 16:19:48 -0700 Subject: [PATCH 3/9] Update the profile names for used in the benchmarks_ci_azure.json file to match the recent update to azure.profile.yml. --- build/benchmarks_ci_azure.json | 100 ++++++++++++++++----------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/build/benchmarks_ci_azure.json b/build/benchmarks_ci_azure.json index 483d0cee6..4398463c5 100644 --- a/build/benchmarks_ci_azure.json +++ b/build/benchmarks_ci_azure.json @@ -15,171 +15,171 @@ }, "machines": [ { - "name": "azure-arm64-db", + "name": "azure-db", "capabilities": { "db": { "priority": 1, "profiles": [ - "azure-arm64-db-db" + "azure-db-db" ], - "default_profile": "azure-arm64-db-db" + "default_profile": "azure-db-db" }, "load": { "priority": 2, "profiles": [ - "azure-arm64-db-load" + "azure-db-load" ], - "default_profile": "azure-arm64-db-load" + "default_profile": "azure-db-load" }, "sut": { "priority": 3, "profiles": [ - "azure-arm64-db-app" + "azure-db-app" ], - "default_profile": "azure-arm64-db-app" + "default_profile": "azure-db-app" } }, "preferred_partners": [] }, { - "name": "azure-arm64-client", + "name": "azure-client", "capabilities": { "load": { "priority": 1, "profiles": [ - "azure-arm64-client-load" + "azure-client-load" ], - "default_profile": "azure-arm64-client-load" + "default_profile": "azure-client-load" }, "sut": { "priority": 2, "profiles": [ - "azure-arm64-client-app" + "azure-client-app" ], - "default_profile": "azure-arm64-client-app" + "default_profile": "azure-client-app" }, "db": { "priority": 3, "profiles": [ - "azure-arm64-client-db" + "azure-client-db" ], - "default_profile": "azure-arm64-client-db" + "default_profile": "azure-client-db" } }, "preferred_partners": [] }, { - "name": "azure-arm64-server", + "name": "azure-server-arm64", "capabilities": { "sut": { "priority": 1, "profiles": [ - "azure-arm64-server-app" + "azure-server-arm64-app" ], - "default_profile": "azure-arm64-server-app" + "default_profile": "azure-server-arm64-app" }, "load": { "priority": 2, "profiles": [ - "azure-arm64-server-load" + "azure-server-arm64-load" ], - "default_profile": "azure-arm64-server-load" + "default_profile": "azure-server-arm64-load" }, "db": { "priority": 3, "profiles": [ - "azure-arm64-server-db" + "azure-server-arm64-db" ], - "default_profile": "azure-arm64-server-db" + "default_profile": "azure-server-arm64-db" } }, "preferred_partners": [ - "azure-arm64-client", - "azure-arm64-db" + "azure-client", + "azure-db" ] }, { - "name": "azure-client", + "name": "azure2-client", "capabilities": { "load": { "priority": 1, "profiles": [ - "azure-client-load" + "azure2-client-load" ], - "default_profile": "azure-client-load" + "default_profile": "azure2-client-load" }, "sut": { "priority": 2, "profiles": [ - "azure-client-app" + "azure2-client-app" ], - "default_profile": "azure-client-app" + "default_profile": "azure2-client-app" }, "db": { "priority": 3, "profiles": [ - "azure-client-db" + "azure2-client-db" ], - "default_profile": "azure-client-db" + "default_profile": "azure2-client-db" } }, "preferred_partners": [] }, { - "name": "azure-db", + "name": "azure2-db", "capabilities": { "db": { "priority": 1, "profiles": [ - "azure-db-db" + "azure2-db-db" ], - "default_profile": "azure-db-db" + "default_profile": "azure2-db-db" }, "sut": { "priority": 2, "profiles": [ - "azure-db-app" + "azure2-db-app" ], - "default_profile": "azure-db-app" + "default_profile": "azure2-db-app" }, "load": { "priority": 3, "profiles": [ - "azure-db-load" + "azure2-db-load" ], - "default_profile": "azure-db-load" + "default_profile": "azure2-db-load" } }, "preferred_partners": [] }, { - "name": "azure-server", + "name": "azure2-server-amd64", "capabilities": { "sut": { "priority": 1, "profiles": [ - "azure-server-app" + "azure2-server-amd64-app" ], - "default_profile": "azure-server-app" + "default_profile": "azure2-server-amd64-app" }, "load": { "priority": 2, "profiles": [ - "azure-server-load" + "azure2-server-amd64-load" ], - "default_profile": "azure-server-load" + "default_profile": "azure2-server-amd64-load" }, "db": { "priority": 3, "profiles": [ - "azure-server-db" + "azure2-server-amd64-db" ], - "default_profile": "azure-server-db" + "default_profile": "azure2-server-amd64-db" } }, "preferred_partners": [ - "azure-client", - "azure-db" + "azure2-client", + "azure2-db" ] }, { @@ -209,7 +209,7 @@ }, "preferred_partners": [ "idna-intel-lin", - "azure-db" + "azure2-db" ] }, { @@ -239,7 +239,7 @@ }, "preferred_partners": [ "idna-amd-lin", - "azure-db" + "azure2-db" ] }, { @@ -269,7 +269,7 @@ }, "preferred_partners": [ "idna-amd-lin", - "azure-db" + "azure2-db" ] }, { @@ -299,7 +299,7 @@ }, "preferred_partners": [ "idna-amd-lin", - "azure-db" + "azure2-db" ] } ], From 095cb4b65bca4908b4fdc8fd19507792a90acfee Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 22 Jul 2025 16:33:43 -0700 Subject: [PATCH 4/9] Add the actual jobs with estimated runtimes from the regular ci runs. --- build/benchmarks_ci_azure.json | 59 ++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/build/benchmarks_ci_azure.json b/build/benchmarks_ci_azure.json index 4398463c5..75104b928 100644 --- a/build/benchmarks_ci_azure.json +++ b/build/benchmarks_ci_azure.json @@ -303,5 +303,60 @@ ] } ], - "scenarios": [] -} \ No newline at end of file + "scenarios": [ + { + "name": "Baselines", + "template": "baselines-scenarios.yml", + "type": 2, + "target_machines": [ + "azure-server-arm64", + "azure2-server-amd64" + ], + "estimated_runtime": 30.0 + }, + { + "name": "Baselines Database", + "template": "baselines-database-scenarios.yml", + "type": 3, + "target_machines": [ + "azure-server-arm64", + "azure2-server-amd64" + ], + "estimated_runtime": 45.0 + }, + { + "name": "Containers", + "template": "containers-scenarios.yml", + "type": 3, + "target_machines": [ + "azure-server-arm64", + "azure2-server-amd64" + ], + "estimated_runtime": 90.0 + }, + { + "name": "Trends", + "template": "trend-scenarios.yml", + "type": 2, + "target_machines": [ + "azure-server-arm64", + "azure2-server-amd64", + "idna-amd-lin", + "idna-amd-win", + "idna-intel-lin", + "idna-intel-win" + ], + "estimated_runtime": 20.0 + }, + { + "name": "Trends Database", + "template": "trend-database-scenarios.yml", + "type": 3, + "target_machines": [ + "azure-server-arm64", + "azure2-server-amd64" + ], + "estimated_runtime": 15.0 + } + ] +} From 8056d8b9e7e51ef5f9f82f856f4edd9b6b342605 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 22 Jul 2025 16:39:29 -0700 Subject: [PATCH 5/9] Only create 1 yaml for the azure ci. --- build/benchmarks_ci_azure.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/benchmarks_ci_azure.json b/build/benchmarks_ci_azure.json index 75104b928..07d02fa50 100644 --- a/build/benchmarks_ci_azure.json +++ b/build/benchmarks_ci_azure.json @@ -9,7 +9,7 @@ "azurearm64" ], "yaml_generation": { - "target_yaml_count": 2, + "target_yaml_count": 1, "schedule_offset_hours": 6 } }, From 8d40d51658d8c009d8aff11a27610bea13a3594c Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 22 Jul 2025 16:40:21 -0700 Subject: [PATCH 6/9] Update the benchmarks-ci-azure.yml file to be based on the new benchmarks_ci_azure.json file. --- build/benchmarks-ci-azure.yml | 139 +++++++++++++++++----------------- 1 file changed, 68 insertions(+), 71 deletions(-) diff --git a/build/benchmarks-ci-azure.yml b/build/benchmarks-ci-azure.yml index f05121bf3..f88513055 100644 --- a/build/benchmarks-ci-azure.yml +++ b/build/benchmarks-ci-azure.yml @@ -31,161 +31,161 @@ jobs: # GROUP 1 -- job: Trends_Database_Azure_Linux - displayName: 1- Trends Database Azure Linux +- job: Containers_Azure_Server_Arm64 + displayName: 1- Containers Azure Server Arm64 pool: server timeoutInMinutes: 120 dependsOn: [] condition: succeededOrFailed() steps: - - template: trend-database-scenarios.yml + - template: containers-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: azure serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile aspnet-azure-lin " + arguments: "$(ciProfile) --profile azure-server-arm64-app --profile azure-client-load --profile azure-db-db " -- job: Trends_Database_Azure_Arm64_Linux - displayName: 1- Trends Database Azure Arm64 Linux +- job: Containers_Azure2_Server_Amd64 + displayName: 1- Containers Azure2 Server Amd64 pool: server timeoutInMinutes: 120 dependsOn: [] condition: succeededOrFailed() steps: - - template: trend-database-scenarios.yml + - template: containers-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: azurearm64 serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " + arguments: "$(ciProfile) --profile azure2-server-amd64-app --profile azure2-client-load --profile azure2-db-db " # GROUP 2 -- job: Trends_Azure_Linux - displayName: 2- Trends Azure Linux +- job: Baselines_Database_Azure_Server_Arm64 + displayName: 2- Baselines Database Azure Server Arm64 pool: server timeoutInMinutes: 120 - dependsOn: [Trends_Database_Azure_Linux, Trends_Database_Azure_Arm64_Linux] + dependsOn: [Containers_Azure_Server_Arm64, Containers_Azure2_Server_Amd64] condition: succeededOrFailed() steps: - - template: trend-scenarios.yml + - template: baselines-database-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: azure serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile aspnet-azure-lin " + arguments: "$(ciProfile) --profile azure-server-arm64-app --profile azure-client-load --profile azure-db-db " -- job: Trends_Azure_Arm64_Linux - displayName: 2- Trends Azure Arm64 Linux +- job: Baselines_Database_Azure2_Server_Amd64 + displayName: 2- Baselines Database Azure2 Server Amd64 pool: server timeoutInMinutes: 120 - dependsOn: [Trends_Database_Azure_Linux, Trends_Database_Azure_Arm64_Linux] + dependsOn: [Containers_Azure_Server_Arm64, Containers_Azure2_Server_Amd64] condition: succeededOrFailed() steps: - - template: trend-scenarios.yml + - template: baselines-database-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: azurearm64 serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " + arguments: "$(ciProfile) --profile azure2-server-amd64-app --profile azure2-client-load --profile azure2-db-db " # GROUP 3 -- job: Baselines_Database_Azure_Linux - displayName: 3- Baselines Database Azure Linux +- job: Baselines_Azure_Server_Arm64 + displayName: 3- Baselines Azure Server Arm64 pool: server timeoutInMinutes: 120 - dependsOn: [Trends_Azure_Linux, Trends_Azure_Arm64_Linux] + dependsOn: [Baselines_Database_Azure_Server_Arm64, Baselines_Database_Azure2_Server_Amd64] condition: succeededOrFailed() steps: - - template: baselines-database-scenarios.yml + - template: baselines-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: azure serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile aspnet-azure-lin " + arguments: "$(ciProfile) --profile azure-server-arm64-app --profile azure-client-load " -- job: Baselines_Database_Azure_Arm64_Linux - displayName: 3- Baselines Database Azure Arm64 Linux +- job: Baselines_Azure2_Server_Amd64 + displayName: 3- Baselines Azure2 Server Amd64 pool: server timeoutInMinutes: 120 - dependsOn: [Trends_Azure_Linux, Trends_Azure_Arm64_Linux] + dependsOn: [Baselines_Database_Azure_Server_Arm64, Baselines_Database_Azure2_Server_Amd64] condition: succeededOrFailed() steps: - - template: baselines-database-scenarios.yml + - template: baselines-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: azurearm64 serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " + arguments: "$(ciProfile) --profile azure2-server-amd64-app --profile azure2-client-load " # GROUP 4 -- job: Baselines_Azure_Linux - displayName: 4- Baselines Azure Linux +- job: Trends_Azure_Server_Arm64 + displayName: 4- Trends Azure Server Arm64 pool: server timeoutInMinutes: 120 - dependsOn: [Baselines_Database_Azure_Linux, Baselines_Database_Azure_Arm64_Linux] + dependsOn: [Baselines_Azure_Server_Arm64, Baselines_Azure2_Server_Amd64] condition: succeededOrFailed() steps: - - template: baselines-scenarios.yml + - template: trend-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: azure serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile aspnet-azure-lin " + arguments: "$(ciProfile) --profile azure-server-arm64-app --profile azure-client-load " -- job: Baselines_Azure_Arm64_Linux - displayName: 4- Baselines Azure Arm64 Linux +- job: Trends_Azure2_Server_Amd64 + displayName: 4- Trends Azure2 Server Amd64 pool: server timeoutInMinutes: 120 - dependsOn: [Baselines_Database_Azure_Linux, Baselines_Database_Azure_Arm64_Linux] + dependsOn: [Baselines_Azure_Server_Arm64, Baselines_Azure2_Server_Amd64] condition: succeededOrFailed() steps: - - template: baselines-scenarios.yml + - template: trend-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: azurearm64 serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " + arguments: "$(ciProfile) --profile azure2-server-amd64-app --profile azure2-client-load " # GROUP 5 -- job: Containers_Azure_Intel_Linux - displayName: 5- Containers Azure Intel Linux +- job: Trends_Idna_Amd_Lin + displayName: 5- Trends Idna Amd Lin pool: server timeoutInMinutes: 120 - dependsOn: [Baselines_Azure_Linux, Baselines_Azure_Arm64_Linux] + dependsOn: [Trends_Azure_Server_Arm64, Trends_Azure2_Server_Amd64] condition: succeededOrFailed() steps: - - template: containers-scenarios.yml + - template: trend-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: azure serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile aspnet-azure-lin " + arguments: "$(ciProfile) --profile idna-amd-lin-app --profile idna-intel-lin-load " -- job: Containers_Azure_Arm64_Linux - displayName: 5- Containers Azure Arm64 Linux +- job: Trends_Idna_Amd_Win + displayName: 5- Trends Idna Amd Win pool: server timeoutInMinutes: 120 - dependsOn: [Baselines_Azure_Linux, Baselines_Azure_Arm64_Linux] + dependsOn: [Trends_Azure_Server_Arm64, Trends_Azure2_Server_Amd64] condition: succeededOrFailed() steps: - - template: containers-scenarios.yml + - template: trend-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: azurearm64 serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile aspnet-azurearm64-lin " + arguments: "$(ciProfile) --profile idna-amd-win-app --profile azure2-db-load " # GROUP 6 -- job: IDNA_Azure_Amd_Linux - displayName: 6- IDNA Azure Amd Linux +- job: Trends_Idna_Intel_Lin + displayName: 6- Trends Idna Intel Lin pool: server timeoutInMinutes: 120 - dependsOn: [Containers_Azure_Intel_Linux, Containers_Azure_Arm64_Linux] + dependsOn: [Trends_Idna_Amd_Lin, Trends_Idna_Amd_Win] condition: succeededOrFailed() steps: - template: trend-scenarios.yml @@ -193,52 +193,49 @@ jobs: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: azure serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile idna-amd-lin " + arguments: "$(ciProfile) --profile idna-intel-lin-app --profile idna-amd-lin-load " -# GROUP 7 - -- job: IDNA_Azure_Intel_Linux - displayName: 7- IDNA Azure Intel Linux +- job: Trends_Idna_Intel_Win + displayName: 6- Trends Idna Intel Win pool: server timeoutInMinutes: 120 - dependsOn: [IDNA_Azure_Amd_Linux] + dependsOn: [Trends_Idna_Amd_Lin, Trends_Idna_Amd_Win] condition: succeededOrFailed() steps: - template: trend-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus - serviceBusQueueName: azure + serviceBusQueueName: azurearm64 serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile idna-intel-lin " + arguments: "$(ciProfile) --profile idna-intel-win-app --profile azure2-db-load " -# GROUP 8 +# GROUP 7 -- job: IDNA_Azure_Amd_Windows - displayName: 8- IDNA Azure Amd Windows +- job: Trends_Database_Azure_Server_Arm64 + displayName: 7- Trends Database Azure Server Arm64 pool: server timeoutInMinutes: 120 - dependsOn: [IDNA_Azure_Intel_Linux] + dependsOn: [Trends_Idna_Intel_Lin, Trends_Idna_Intel_Win] condition: succeededOrFailed() steps: - - template: trend-scenarios.yml + - template: trend-database-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: azure serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile idna-amd-win " + arguments: "$(ciProfile) --profile azure-server-arm64-app --profile azure-client-load --profile azure-db-db " -- job: IDNA_Azure_Intel_Windows - displayName: 8- IDNA Azure Intel Windows +- job: Trends_Database_Azure2_Server_Amd64 + displayName: 7- Trends Database Azure2 Server Amd64 pool: server timeoutInMinutes: 120 - dependsOn: [IDNA_Azure_Intel_Linux] + dependsOn: [Trends_Idna_Intel_Lin, Trends_Idna_Intel_Win] condition: succeededOrFailed() steps: - - template: trend-scenarios.yml + - template: trend-database-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: azurearm64 serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile idna-intel-win " + arguments: "$(ciProfile) --profile azure2-server-amd64-app --profile azure2-client-load --profile azure2-db-db " - From 657600087b72c1599c52ce351dd4445069d6725a Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 28 Jul 2025 16:16:32 -0700 Subject: [PATCH 7/9] Include the serverPort variable in the azure.profile.yml file. --- build/azure.profile.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/build/azure.profile.yml b/build/azure.profile.yml index 41dcf7697..c400e05e5 100644 --- a/build/azure.profile.yml +++ b/build/azure.profile.yml @@ -404,6 +404,7 @@ profiles: # Add individual machine profiles for azure-db similar to ci.profile.yml azure-db-app: # azurearm64db variables: + serverPort: 5000 serverAddress: 10.0.4.9 cores: 4 agents: @@ -439,6 +440,7 @@ profiles: # Individual machine profiles for azure-client azure-client-app: # azurearm64client variables: + serverPort: 5000 serverAddress: 10.0.4.8 cores: 4 agents: @@ -474,6 +476,7 @@ profiles: # Individual machine profiles for azure-server-arm64 azure-server-arm64-app: # azurearm64server variables: + serverPort: 5000 serverAddress: 10.0.4.7 cores: 4 agents: @@ -509,6 +512,7 @@ profiles: # Individual machine profiles for azure2-client azure2-client-app: variables: + serverPort: 5000 serverAddress: 10.0.4.5 cores: 2 agents: @@ -544,6 +548,7 @@ profiles: # Individual machine profiles for azure2-db azure2-db-app: variables: + serverPort: 5000 serverAddress: 10.0.4.6 cores: 2 agents: @@ -579,6 +584,7 @@ profiles: # Individual machine profiles for azure2-server-amd64 azure2-server-amd64-app: variables: + serverPort: 5000 serverAddress: 10.0.4.4 cores: 4 agents: @@ -614,6 +620,7 @@ profiles: # Individual machine profiles for idna-amd-lin idna-amd-lin-app: variables: + serverPort: 5000 serverAddress: 10.0.4.13 cores: 4 agents: @@ -649,6 +656,7 @@ profiles: # Individual machine profiles for idna-amd-win idna-amd-win-app: variables: + serverPort: 5000 serverAddress: 10.0.4.15 cores: 4 agents: @@ -684,6 +692,7 @@ profiles: # Individual machine profiles for idna-intel-lin idna-intel-lin-app: variables: + serverPort: 5000 serverAddress: 10.0.4.12 cores: 4 agents: @@ -719,6 +728,7 @@ profiles: # Individual machine profiles for idna-intel-win idna-intel-win-app: variables: + serverPort: 5000 serverAddress: 10.0.4.14 cores: 4 agents: @@ -759,6 +769,7 @@ profiles: # Individual machine profiles for cobalt-cloud-lin-client cobalt-cloud-lin-client-app: variables: + serverPort: 5000 serverAddress: 10.2.2.13 cores: 16 agents: @@ -794,6 +805,7 @@ profiles: # Individual machine profiles for cobalt-cloud-lin-db cobalt-cloud-lin-db-app: variables: + serverPort: 5000 serverAddress: 10.2.2.14 cores: 16 agents: @@ -829,6 +841,7 @@ profiles: # Individual machine profiles for cobalt-cloud-lin-server cobalt-cloud-lin-server-app: variables: + serverPort: 5000 serverAddress: 10.2.2.15 cores: 16 agents: @@ -864,6 +877,7 @@ profiles: # Individual machine profiles for cobalt-cloud-lin-server-azure-linux3 cobalt-cloud-lin-server-azure-linux3-app: variables: + serverPort: 5000 serverAddress: 10.2.2.16 cores: 16 agents: From 2fb9422fac7829a7a698ee0828bf512d6325f9ec Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Mon, 28 Jul 2025 16:31:50 -0700 Subject: [PATCH 8/9] Add the json config file for the eastus2 jobs and generate the associated schedule yaml. --- build/benchmarks-ci-azure-eastus2.yml | 118 +++++++-------- build/benchmarks_ci_azure_eastus2.json | 193 +++++++++++++++++++++++++ 2 files changed, 252 insertions(+), 59 deletions(-) create mode 100644 build/benchmarks_ci_azure_eastus2.json diff --git a/build/benchmarks-ci-azure-eastus2.yml b/build/benchmarks-ci-azure-eastus2.yml index b5b09b80e..d9e03791f 100644 --- a/build/benchmarks-ci-azure-eastus2.yml +++ b/build/benchmarks-ci-azure-eastus2.yml @@ -31,43 +31,43 @@ jobs: # GROUP 1 -- job: Trends_Database_Cobalt_Cloud_Linux - displayName: 1- Trends Database Cobalt Cloud Linux +- job: Containers_Cobalt_Cloud_Lin_Server + displayName: 1- Containers Cobalt Cloud Lin Server pool: server timeoutInMinutes: 120 dependsOn: [] condition: succeededOrFailed() steps: - - template: trend-database-scenarios.yml + - template: containers-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: cobaltcloud serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin " + arguments: "$(ciProfile) --profile cobalt-cloud-lin-server-app --profile cobalt-cloud-lin-client-load --profile cobalt-cloud-lin-db-db " # GROUP 2 -- job: Trends_Cobalt_Cloud_Linux - displayName: 2- Trends Cobalt Cloud Linux +- job: Containers_Cobalt_Cloud_Lin_Server_Azure_Linux3 + displayName: 2- Containers Cobalt Cloud Lin Server Azure Linux3 pool: server timeoutInMinutes: 120 - dependsOn: [Trends_Database_Cobalt_Cloud_Linux] + dependsOn: [Containers_Cobalt_Cloud_Lin_Server] condition: succeededOrFailed() steps: - - template: trend-scenarios.yml + - template: containers-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: cobaltcloud serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin " + arguments: "$(ciProfile) --profile cobalt-cloud-lin-server-azure-linux3-app --profile cobalt-cloud-lin-client-load --profile cobalt-cloud-lin-db-db " # GROUP 3 -- job: Baselines_Database_Cobalt_Cloud_Linux - displayName: 3- Baselines Database Cobalt Cloud Linux +- job: Baselines_Database_Cobalt_Cloud_Lin_Server + displayName: 3- Baselines Database Cobalt Cloud Lin Server pool: server timeoutInMinutes: 120 - dependsOn: [Trends_Cobalt_Cloud_Linux] + dependsOn: [Containers_Cobalt_Cloud_Lin_Server_Azure_Linux3] condition: succeededOrFailed() steps: - template: baselines-database-scenarios.yml @@ -75,149 +75,149 @@ jobs: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: cobaltcloud serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin " + arguments: "$(ciProfile) --profile cobalt-cloud-lin-server-app --profile cobalt-cloud-lin-client-load --profile cobalt-cloud-lin-db-db " # GROUP 4 -- job: Baselines_Cobalt_Cloud_Linux - displayName: 4- Baselines Cobalt Cloud Linux +- job: Baselines_Database_Cobalt_Cloud_Lin_Server_Azure_Linux3 + displayName: 4- Baselines Database Cobalt Cloud Lin Server Azure Linux3 pool: server timeoutInMinutes: 120 - dependsOn: [Baselines_Database_Cobalt_Cloud_Linux] + dependsOn: [Baselines_Database_Cobalt_Cloud_Lin_Server] condition: succeededOrFailed() steps: - - template: baselines-scenarios.yml + - template: baselines-database-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: cobaltcloud serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin " + arguments: "$(ciProfile) --profile cobalt-cloud-lin-server-azure-linux3-app --profile cobalt-cloud-lin-client-load --profile cobalt-cloud-lin-db-db " # GROUP 5 -- job: Containers_Cobalt_Cloud_Linux - displayName: 5- Containers Cobalt Cloud Linux +- job: Baselines_Cobalt_Cloud_Lin_Server + displayName: 5- Baselines Cobalt Cloud Lin Server pool: server timeoutInMinutes: 120 - dependsOn: [Baselines_Cobalt_Cloud_Linux] + dependsOn: [Baselines_Database_Cobalt_Cloud_Lin_Server_Azure_Linux3] condition: succeededOrFailed() steps: - - template: containers-scenarios.yml + - template: baselines-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: cobaltcloud serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin " + arguments: "$(ciProfile) --profile cobalt-cloud-lin-server-app --profile cobalt-cloud-lin-client-load " # GROUP 6 -- job: Mvc_Cobalt_Cloud_Linux - displayName: 6- Mvc Cobalt Cloud Linux +- job: Baselines_Cobalt_Cloud_Lin_Server_Azure_Linux3 + displayName: 6- Baselines Cobalt Cloud Lin Server Azure Linux3 pool: server timeoutInMinutes: 120 - dependsOn: [Containers_Cobalt_Cloud_Linux] + dependsOn: [Baselines_Cobalt_Cloud_Lin_Server] condition: succeededOrFailed() steps: - - template: mvc-scenarios.yml + - template: baselines-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: cobaltcloud serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin " + arguments: "$(ciProfile) --profile cobalt-cloud-lin-server-azure-linux3-app --profile cobalt-cloud-lin-client-load " # GROUP 7 -- job: Trends_Database_Cobalt_Cloud_Linux_AL3 - displayName: 7- Trends Database Cobalt Cloud Linux AL3 +- job: MVC_Cobalt_Cloud_Lin_Server + displayName: 7- MVC Cobalt Cloud Lin Server pool: server timeoutInMinutes: 120 - dependsOn: [Mvc_Cobalt_Cloud_Linux] + dependsOn: [Baselines_Cobalt_Cloud_Lin_Server_Azure_Linux3] condition: succeededOrFailed() steps: - - template: trend-database-scenarios.yml + - template: mvc-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: cobaltcloud serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin-al3 " + arguments: "$(ciProfile) --profile cobalt-cloud-lin-server-app --profile cobalt-cloud-lin-client-load --profile cobalt-cloud-lin-db-db " # GROUP 8 -- job: Trends_Cobalt_Cloud_Linux_AL3 - displayName: 8- Trends Cobalt Cloud Linux AL3 +- job: MVC_Cobalt_Cloud_Lin_Server_Azure_Linux3 + displayName: 8- MVC Cobalt Cloud Lin Server Azure Linux3 pool: server timeoutInMinutes: 120 - dependsOn: [Trends_Database_Cobalt_Cloud_Linux_AL3] + dependsOn: [MVC_Cobalt_Cloud_Lin_Server] condition: succeededOrFailed() steps: - - template: trend-scenarios.yml + - template: mvc-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: cobaltcloud serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin-al3 " + arguments: "$(ciProfile) --profile cobalt-cloud-lin-server-azure-linux3-app --profile cobalt-cloud-lin-client-load --profile cobalt-cloud-lin-db-db " # GROUP 9 -- job: Baselines_Database_Cobalt_Cloud_Linux_AL3 - displayName: 9- Baselines Database Cobalt Cloud Linux AL3 +- job: Trends_Cobalt_Cloud_Lin_Server + displayName: 9- Trends Cobalt Cloud Lin Server pool: server timeoutInMinutes: 120 - dependsOn: [Trends_Cobalt_Cloud_Linux_AL3] + dependsOn: [MVC_Cobalt_Cloud_Lin_Server_Azure_Linux3] condition: succeededOrFailed() steps: - - template: baselines-database-scenarios.yml + - template: trend-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: cobaltcloud serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin-al3 " + arguments: "$(ciProfile) --profile cobalt-cloud-lin-server-app --profile cobalt-cloud-lin-client-load " # GROUP 10 -- job: Baselines_Cobalt_Cloud_Linux_AL3 - displayName: 10- Baselines Cobalt Cloud Linux AL3 +- job: Trends_Cobalt_Cloud_Lin_Server_Azure_Linux3 + displayName: 10- Trends Cobalt Cloud Lin Server Azure Linux3 pool: server timeoutInMinutes: 120 - dependsOn: [Baselines_Database_Cobalt_Cloud_Linux_AL3] + dependsOn: [Trends_Cobalt_Cloud_Lin_Server] condition: succeededOrFailed() steps: - - template: baselines-scenarios.yml + - template: trend-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: cobaltcloud serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin-al3 " + arguments: "$(ciProfile) --profile cobalt-cloud-lin-server-azure-linux3-app --profile cobalt-cloud-lin-client-load " # GROUP 11 -- job: Containers_Cobalt_Cloud_Linux_AL3 - displayName: 11- Containers Cobalt Cloud Linux AL3 +- job: Trends_Database_Cobalt_Cloud_Lin_Server + displayName: 11- Trends Database Cobalt Cloud Lin Server pool: server timeoutInMinutes: 120 - dependsOn: [Baselines_Cobalt_Cloud_Linux_AL3] + dependsOn: [Trends_Cobalt_Cloud_Lin_Server_Azure_Linux3] condition: succeededOrFailed() steps: - - template: containers-scenarios.yml + - template: trend-database-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: cobaltcloud serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin-al3 " + arguments: "$(ciProfile) --profile cobalt-cloud-lin-server-app --profile cobalt-cloud-lin-client-load --profile cobalt-cloud-lin-db-db " # GROUP 12 -- job: Mvc_Cobalt_Cloud_Linux_AL3 - displayName: 12- Mvc Cobalt Cloud Linux AL3 +- job: Trends_Database_Cobalt_Cloud_Lin_Server_Azure_Linux3 + displayName: 12- Trends Database Cobalt Cloud Lin Server Azure Linux3 pool: server timeoutInMinutes: 120 - dependsOn: [Containers_Cobalt_Cloud_Linux_AL3] + dependsOn: [Trends_Database_Cobalt_Cloud_Lin_Server] condition: succeededOrFailed() steps: - - template: mvc-scenarios.yml + - template: trend-database-scenarios.yml parameters: connection: ASPNET Benchmarks Service Bus serviceBusQueueName: cobaltcloud serviceBusNamespace: aspnetbenchmarks - arguments: "$(ciProfile) --profile cobalt-cloud-lin-al3 " - \ No newline at end of file + arguments: "$(ciProfile) --profile cobalt-cloud-lin-server-azure-linux3-app --profile cobalt-cloud-lin-client-load --profile cobalt-cloud-lin-db-db " + diff --git a/build/benchmarks_ci_azure_eastus2.json b/build/benchmarks_ci_azure_eastus2.json new file mode 100644 index 000000000..f2fce300b --- /dev/null +++ b/build/benchmarks_ci_azure_eastus2.json @@ -0,0 +1,193 @@ +{ + "metadata": { + "name": "Azure CI Benchmarks Configuration", + "description": "Combined machines and scenarios for continuous integration benchmarks on Azure", + "version": "1.0", + "schedule": "0 9/12 * * *", + "queues": [ + "cobaltcloud" + ], + "yaml_generation": { + "target_yaml_count": 1, + "schedule_offset_hours": 6 + } + }, + "machines": [ + { + "name": "cobalt-cloud-lin-server", + "capabilities": { + "sut": { + "priority": 1, + "profiles": [ + "cobalt-cloud-lin-server-app" + ], + "default_profile": "cobalt-cloud-lin-server-app" + }, + "load": { + "priority": 2, + "profiles": [ + "cobalt-cloud-lin-server-load" + ], + "default_profile": "cobalt-cloud-lin-server-load" + }, + "db": { + "priority": 3, + "profiles": [ + "cobalt-cloud-lin-server-db" + ], + "default_profile": "cobalt-cloud-lin-server-db" + } + }, + "preferred_partners": [ + "cobalt-cloud-lin-client", + "cobalt-cloud-lin-db" + ] + }, + { + "name": "cobalt-cloud-lin-client", + "capabilities": { + "load": { + "priority": 1, + "profiles": [ + "cobalt-cloud-lin-client-load" + ], + "default_profile": "cobalt-cloud-lin-client-load" + }, + "db": { + "priority": 2, + "profiles": [ + "cobalt-cloud-lin-client-db" + ], + "default_profile": "cobalt-cloud-lin-client-db" + }, + "sut": { + "priority": 3, + "profiles": [ + "cobalt-cloud-lin-client-app" + ], + "default_profile": "cobalt-cloud-lin-client-app" + } + }, + "preferred_partners": [] + }, + { + "name": "cobalt-cloud-lin-db", + "capabilities": { + "db": { + "priority": 1, + "profiles": [ + "cobalt-cloud-lin-db-db" + ], + "default_profile": "cobalt-cloud-lin-db-db" + }, + "load": { + "priority": 2, + "profiles": [ + "cobalt-cloud-lin-db-load" + ], + "default_profile": "cobalt-cloud-lin-db-load" + }, + "sut": { + "priority": 3, + "profiles": [ + "cobalt-cloud-lin-db-app" + ], + "default_profile": "cobalt-cloud-lin-db-app" + } + }, + "preferred_partners": [] + }, + { + "name": "cobalt-cloud-lin-server-azure-linux3", + "capabilities": { + "sut": { + "priority": 1, + "profiles": [ + "cobalt-cloud-lin-server-azure-linux3-app" + ], + "default_profile": "cobalt-cloud-lin-server-azure-linux3-app" + }, + "load": { + "priority": 2, + "profiles": [ + "cobalt-cloud-lin-server-azure-linux3-load" + ], + "default_profile": "cobalt-cloud-lin-server-azure-linux3-load" + }, + "db": { + "priority": 3, + "profiles": [ + "cobalt-cloud-lin-server-azure-linux3-db" + ], + "default_profile": "cobalt-cloud-lin-server-azure-linux3-db" + } + }, + "preferred_partners": [ + "cobalt-cloud-lin-client", + "cobalt-cloud-lin-db" + ] + } + ], + "scenarios": [ + { + "name": "Baselines", + "template": "baselines-scenarios.yml", + "type": 2, + "target_machines": [ + "cobalt-cloud-lin-server", + "cobalt-cloud-lin-server-azure-linux3" + ], + "estimated_runtime": 30.0 + }, + { + "name": "Baselines Database", + "template": "baselines-database-scenarios.yml", + "type": 3, + "target_machines": [ + "cobalt-cloud-lin-server", + "cobalt-cloud-lin-server-azure-linux3" + ], + "estimated_runtime": 45.0 + }, + { + "name": "Containers", + "template": "containers-scenarios.yml", + "type": 3, + "target_machines": [ + "cobalt-cloud-lin-server", + "cobalt-cloud-lin-server-azure-linux3" + ], + "estimated_runtime": 90.0 + }, + { + "name": "MVC", + "template": "mvc-scenarios.yml", + "type": 3, + "target_machines": [ + "cobalt-cloud-lin-server", + "cobalt-cloud-lin-server-azure-linux3" + ], + "estimated_runtime": 20.0 + }, + { + "name": "Trends", + "template": "trend-scenarios.yml", + "type": 2, + "target_machines": [ + "cobalt-cloud-lin-server", + "cobalt-cloud-lin-server-azure-linux3" + ], + "estimated_runtime": 20.0 + }, + { + "name": "Trends Database", + "template": "trend-database-scenarios.yml", + "type": 3, + "target_machines": [ + "cobalt-cloud-lin-server", + "cobalt-cloud-lin-server-azure-linux3" + ], + "estimated_runtime": 15.0 + } + ] +} From 025d869943cce9a126aeffac409fdd0afc61bbc3 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Thu, 31 Jul 2025 15:06:40 -0700 Subject: [PATCH 9/9] Cleanup unnecessary configuration options default_profile and preferred_partners (when empty). --- build/benchmarks_ci_azure.json | 102 +++++++++---------------- build/benchmarks_ci_azure_eastus2.json | 42 ++++------ 2 files changed, 48 insertions(+), 96 deletions(-) diff --git a/build/benchmarks_ci_azure.json b/build/benchmarks_ci_azure.json index 07d02fa50..878d01676 100644 --- a/build/benchmarks_ci_azure.json +++ b/build/benchmarks_ci_azure.json @@ -21,25 +21,21 @@ "priority": 1, "profiles": [ "azure-db-db" - ], - "default_profile": "azure-db-db" + ] }, "load": { "priority": 2, "profiles": [ "azure-db-load" - ], - "default_profile": "azure-db-load" + ] }, "sut": { "priority": 3, "profiles": [ "azure-db-app" - ], - "default_profile": "azure-db-app" + ] } - }, - "preferred_partners": [] + } }, { "name": "azure-client", @@ -48,25 +44,21 @@ "priority": 1, "profiles": [ "azure-client-load" - ], - "default_profile": "azure-client-load" + ] }, "sut": { "priority": 2, "profiles": [ "azure-client-app" - ], - "default_profile": "azure-client-app" + ] }, "db": { "priority": 3, "profiles": [ "azure-client-db" - ], - "default_profile": "azure-client-db" + ] } - }, - "preferred_partners": [] + } }, { "name": "azure-server-arm64", @@ -75,22 +67,19 @@ "priority": 1, "profiles": [ "azure-server-arm64-app" - ], - "default_profile": "azure-server-arm64-app" + ] }, "load": { "priority": 2, "profiles": [ "azure-server-arm64-load" - ], - "default_profile": "azure-server-arm64-load" + ] }, "db": { "priority": 3, "profiles": [ "azure-server-arm64-db" - ], - "default_profile": "azure-server-arm64-db" + ] } }, "preferred_partners": [ @@ -105,25 +94,21 @@ "priority": 1, "profiles": [ "azure2-client-load" - ], - "default_profile": "azure2-client-load" + ] }, "sut": { "priority": 2, "profiles": [ "azure2-client-app" - ], - "default_profile": "azure2-client-app" + ] }, "db": { "priority": 3, "profiles": [ "azure2-client-db" - ], - "default_profile": "azure2-client-db" + ] } - }, - "preferred_partners": [] + } }, { "name": "azure2-db", @@ -132,25 +117,21 @@ "priority": 1, "profiles": [ "azure2-db-db" - ], - "default_profile": "azure2-db-db" + ] }, "sut": { "priority": 2, "profiles": [ "azure2-db-app" - ], - "default_profile": "azure2-db-app" + ] }, "load": { "priority": 3, "profiles": [ "azure2-db-load" - ], - "default_profile": "azure2-db-load" + ] } - }, - "preferred_partners": [] + } }, { "name": "azure2-server-amd64", @@ -159,22 +140,19 @@ "priority": 1, "profiles": [ "azure2-server-amd64-app" - ], - "default_profile": "azure2-server-amd64-app" + ] }, "load": { "priority": 2, "profiles": [ "azure2-server-amd64-load" - ], - "default_profile": "azure2-server-amd64-load" + ] }, "db": { "priority": 3, "profiles": [ "azure2-server-amd64-db" - ], - "default_profile": "azure2-server-amd64-db" + ] } }, "preferred_partners": [ @@ -189,22 +167,19 @@ "priority": 1, "profiles": [ "idna-amd-lin-app" - ], - "default_profile": "idna-amd-lin-app" + ] }, "load": { "priority": 2, "profiles": [ "idna-amd-lin-load" - ], - "default_profile": "idna-amd-lin-load" + ] }, "db": { "priority": 3, "profiles": [ "idna-amd-lin-db" - ], - "default_profile": "idna-amd-lin-db" + ] } }, "preferred_partners": [ @@ -219,22 +194,19 @@ "priority": 1, "profiles": [ "idna-amd-win-app" - ], - "default_profile": "idna-amd-win-app" + ] }, "load": { "priority": 2, "profiles": [ "idna-amd-win-load" - ], - "default_profile": "idna-amd-win-load" + ] }, "db": { "priority": 3, "profiles": [ "idna-amd-win-db" - ], - "default_profile": "idna-amd-win-db" + ] } }, "preferred_partners": [ @@ -249,22 +221,19 @@ "priority": 1, "profiles": [ "idna-intel-lin-app" - ], - "default_profile": "idna-intel-lin-app" + ] }, "load": { "priority": 2, "profiles": [ "idna-intel-lin-load" - ], - "default_profile": "idna-intel-lin-load" + ] }, "db": { "priority": 3, "profiles": [ "idna-intel-lin-db" - ], - "default_profile": "idna-intel-lin-db" + ] } }, "preferred_partners": [ @@ -279,22 +248,19 @@ "priority": 1, "profiles": [ "idna-intel-win-app" - ], - "default_profile": "idna-intel-win-app" + ] }, "load": { "priority": 2, "profiles": [ "idna-intel-win-load" - ], - "default_profile": "idna-intel-win-load" + ] }, "db": { "priority": 3, "profiles": [ "idna-intel-win-db" - ], - "default_profile": "idna-intel-win-db" + ] } }, "preferred_partners": [ diff --git a/build/benchmarks_ci_azure_eastus2.json b/build/benchmarks_ci_azure_eastus2.json index f2fce300b..6e6d39678 100644 --- a/build/benchmarks_ci_azure_eastus2.json +++ b/build/benchmarks_ci_azure_eastus2.json @@ -20,22 +20,19 @@ "priority": 1, "profiles": [ "cobalt-cloud-lin-server-app" - ], - "default_profile": "cobalt-cloud-lin-server-app" + ] }, "load": { "priority": 2, "profiles": [ "cobalt-cloud-lin-server-load" - ], - "default_profile": "cobalt-cloud-lin-server-load" + ] }, "db": { "priority": 3, "profiles": [ "cobalt-cloud-lin-server-db" - ], - "default_profile": "cobalt-cloud-lin-server-db" + ] } }, "preferred_partners": [ @@ -50,25 +47,21 @@ "priority": 1, "profiles": [ "cobalt-cloud-lin-client-load" - ], - "default_profile": "cobalt-cloud-lin-client-load" + ] }, "db": { "priority": 2, "profiles": [ "cobalt-cloud-lin-client-db" - ], - "default_profile": "cobalt-cloud-lin-client-db" + ] }, "sut": { "priority": 3, "profiles": [ "cobalt-cloud-lin-client-app" - ], - "default_profile": "cobalt-cloud-lin-client-app" + ] } - }, - "preferred_partners": [] + } }, { "name": "cobalt-cloud-lin-db", @@ -77,25 +70,21 @@ "priority": 1, "profiles": [ "cobalt-cloud-lin-db-db" - ], - "default_profile": "cobalt-cloud-lin-db-db" + ] }, "load": { "priority": 2, "profiles": [ "cobalt-cloud-lin-db-load" - ], - "default_profile": "cobalt-cloud-lin-db-load" + ] }, "sut": { "priority": 3, "profiles": [ "cobalt-cloud-lin-db-app" - ], - "default_profile": "cobalt-cloud-lin-db-app" + ] } - }, - "preferred_partners": [] + } }, { "name": "cobalt-cloud-lin-server-azure-linux3", @@ -104,22 +93,19 @@ "priority": 1, "profiles": [ "cobalt-cloud-lin-server-azure-linux3-app" - ], - "default_profile": "cobalt-cloud-lin-server-azure-linux3-app" + ] }, "load": { "priority": 2, "profiles": [ "cobalt-cloud-lin-server-azure-linux3-load" - ], - "default_profile": "cobalt-cloud-lin-server-azure-linux3-load" + ] }, "db": { "priority": 3, "profiles": [ "cobalt-cloud-lin-server-azure-linux3-db" - ], - "default_profile": "cobalt-cloud-lin-server-azure-linux3-db" + ] } }, "preferred_partners": [