Skip to content

Commit 0f9b865

Browse files
committed
Run the azure configurations through the updated liquid template and added machine_groups for the base azure configuration.
1 parent 166aa5f commit 0f9b865

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

build/benchmarks-ci-azure-eastus2.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Do not change this file, it is generated using these steps:
2-
# - The file benchmarks.matrix.yml defines how each job is run in parallel
3-
# - Convert its content to json using https://jsonformatter.org/yaml-to-json
4-
# - Use the template in benchmarks.template.liquid and the converted json using https://liquidjs.com/playground.html
5-
# - Update this file with the result of the template generation
2+
# - The file benchmarks*.json defines how each pipeline set of jobs is run in parallel
3+
# - Update the associated benchmarks*.json file with machine and scenario updates
4+
# - Install python and install the requirements for the crank-scheduler in benchmarks/scripts/crank-scheduler/requirements.txt
5+
# - Run the scheduler specifying the desired benchmarks*.json file, this template, and benchmarks/output to automatically overwrite the current pipeline.
6+
# - Ex. python ./scripts/crank-scheduler/main.py --config ./build/benchmarks_ci.json --template ./build/benchmarks.template.liquid --yaml-output ./build
67

78
trigger: none
89
pr: none

build/benchmarks-ci-azure.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Do not change this file, it is generated using these steps:
2-
# - The file benchmarks.matrix.yml defines how each job is run in parallel
3-
# - Convert its content to json using https://jsonformatter.org/yaml-to-json
4-
# - Use the template in benchmarks.template.liquid and the converted json using https://liquidjs.com/playground.html
5-
# - Update this file with the result of the template generation
2+
# - The file benchmarks*.json defines how each pipeline set of jobs is run in parallel
3+
# - Update the associated benchmarks*.json file with machine and scenario updates
4+
# - Install python and install the requirements for the crank-scheduler in benchmarks/scripts/crank-scheduler/requirements.txt
5+
# - Run the scheduler specifying the desired benchmarks*.json file, this template, and benchmarks/output to automatically overwrite the current pipeline.
6+
# - Ex. python ./scripts/crank-scheduler/main.py --config ./build/benchmarks_ci.json --template ./build/benchmarks.template.liquid --yaml-output ./build
67

78
trigger: none
89
pr: none
@@ -177,7 +178,7 @@ jobs:
177178
connection: ASPNET Benchmarks Service Bus
178179
serviceBusQueueName: azurearm64
179180
serviceBusNamespace: aspnetbenchmarks
180-
arguments: "$(ciProfile) --profile idna-amd-win-app --profile azure2-db-load "
181+
arguments: "$(ciProfile) --profile idna-amd-win-app --profile idna-intel-win-load "
181182

182183
# GROUP 6
183184

@@ -207,7 +208,7 @@ jobs:
207208
connection: ASPNET Benchmarks Service Bus
208209
serviceBusQueueName: azurearm64
209210
serviceBusNamespace: aspnetbenchmarks
210-
arguments: "$(ciProfile) --profile idna-intel-win-app --profile azure2-db-load "
211+
arguments: "$(ciProfile) --profile idna-intel-win-app --profile idna-amd-win-load "
211212

212213
# GROUP 7
213214

build/benchmarks_ci_azure.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"machines": [
1717
{
1818
"name": "azure-db",
19+
"machine_group": "azure",
1920
"capabilities": {
2021
"db": {
2122
"priority": 1,
@@ -39,6 +40,7 @@
3940
},
4041
{
4142
"name": "azure-client",
43+
"machine_group": "azure",
4244
"capabilities": {
4345
"load": {
4446
"priority": 1,
@@ -62,6 +64,7 @@
6264
},
6365
{
6466
"name": "azure-server-arm64",
67+
"machine_group": "azure",
6568
"capabilities": {
6669
"sut": {
6770
"priority": 1,
@@ -89,6 +92,7 @@
8992
},
9093
{
9194
"name": "azure2-client",
95+
"machine_group": "azure2",
9296
"capabilities": {
9397
"load": {
9498
"priority": 1,
@@ -112,6 +116,7 @@
112116
},
113117
{
114118
"name": "azure2-db",
119+
"machine_group": "azure2",
115120
"capabilities": {
116121
"db": {
117122
"priority": 1,
@@ -135,6 +140,7 @@
135140
},
136141
{
137142
"name": "azure2-server-amd64",
143+
"machine_group": "azure2",
138144
"capabilities": {
139145
"sut": {
140146
"priority": 1,
@@ -162,6 +168,7 @@
162168
},
163169
{
164170
"name": "idna-amd-lin",
171+
"machine_group": "idna",
165172
"capabilities": {
166173
"sut": {
167174
"priority": 1,
@@ -189,6 +196,7 @@
189196
},
190197
{
191198
"name": "idna-amd-win",
199+
"machine_group": "idna",
192200
"capabilities": {
193201
"sut": {
194202
"priority": 1,
@@ -216,6 +224,7 @@
216224
},
217225
{
218226
"name": "idna-intel-lin",
227+
"machine_group": "idna",
219228
"capabilities": {
220229
"sut": {
221230
"priority": 1,
@@ -243,6 +252,7 @@
243252
},
244253
{
245254
"name": "idna-intel-win",
255+
"machine_group": "idna",
246256
"capabilities": {
247257
"sut": {
248258
"priority": 1,

0 commit comments

Comments
 (0)