Skip to content

Commit 36a93fe

Browse files
LoopedBard3LoopedBard3
committed
Updated the crank hosted profile names in the ci.profile.yml to match the conventions in the azure linux 3 update PR, and added the benchmarks_ci_cobalt.json file to include the cobalt machines and to match the tests of the Azure Linux VMs ci.
1 parent ff78f4b commit 36a93fe

File tree

2 files changed

+176
-6
lines changed

2 files changed

+176
-6
lines changed

‎build/benchmarks_ci_cobalt.json‎

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
{
2+
"metadata": {
3+
"name": "CI Benchmarks Configuration",
4+
"description": "Combined machines and scenarios for continuous integration benchmarks",
5+
"version": "1.0",
6+
"schedule": "0 3/12 * * *",
7+
"queues": [
8+
"cobalt-queue-ubuntu",
9+
"cobalt-queue-al3"
10+
],
11+
"yaml_generation": {
12+
"target_yaml_count": 1,
13+
"schedule_offset_hours": 6
14+
}
15+
},
16+
"machines": [
17+
{
18+
"name": "cobalt-hosted-lin-server",
19+
"capabilities": {
20+
"sut": {
21+
"priority": 1,
22+
"profiles": [
23+
"cobalt-hosted-lin-server-app"
24+
],
25+
"default_profile": "cobalt-hosted-lin-server-app"
26+
}
27+
},
28+
"preferred_partners": [
29+
"cobalt-hosted-lin-client",
30+
"cobalt-hosted-lin-db"
31+
]
32+
},
33+
{
34+
"name": "cobalt-hosted-lin-client",
35+
"capabilities": {
36+
"load": {
37+
"priority": 1,
38+
"profiles": [
39+
"cobalt-hosted-lin-client-load"
40+
],
41+
"default_profile": "cobalt-hosted-lin-client-load"
42+
}
43+
},
44+
"preferred_partners": []
45+
},
46+
{
47+
"name": "cobalt-hosted-lin-db",
48+
"capabilities": {
49+
"db": {
50+
"priority": 1,
51+
"profiles": [
52+
"cobalt-hosted-lin-db-db"
53+
],
54+
"default_profile": "cobalt-hosted-lin-db-db"
55+
}
56+
},
57+
"preferred_partners": []
58+
},
59+
{
60+
"name": "cobalt-hosted-lin-server-azure-linux3",
61+
"capabilities": {
62+
"sut": {
63+
"priority": 1,
64+
"profiles": [
65+
"cobalt-hosted-lin-server-azure-linux3-app"
66+
],
67+
"default_profile": "cobalt-hosted-lin-server-azure-linux3-app"
68+
}
69+
},
70+
"preferred_partners": [
71+
"cobalt-hosted-lin-client-azure-linux3",
72+
"cobalt-hosted-lin-db-azure-linux3"
73+
]
74+
},
75+
{
76+
"name": "cobalt-hosted-lin-client-azure-linux3",
77+
"capabilities": {
78+
"load": {
79+
"priority": 1,
80+
"profiles": [
81+
"cobalt-hosted-lin-client-azure-linux3-load"
82+
],
83+
"default_profile": "cobalt-hosted-lin-client-azure-linux3-load"
84+
}
85+
},
86+
"preferred_partners": []
87+
},
88+
{
89+
"name": "cobalt-hosted-lin-db-azure-linux3",
90+
"capabilities": {
91+
"db": {
92+
"priority": 1,
93+
"profiles": [
94+
"cobalt-hosted-lin-db-azure-linux3-db"
95+
],
96+
"default_profile": "cobalt-hosted-lin-db-azure-linux3-db"
97+
}
98+
},
99+
"preferred_partners": []
100+
}
101+
],
102+
"scenarios": [
103+
{
104+
"name": "Baselines",
105+
"template": "baselines-scenarios.yml",
106+
"type": 2,
107+
"target_machines": [
108+
"cobalt-hosted-lin-server",
109+
"cobalt-hosted-lin-server-azure-linux3"
110+
],
111+
"estimated_runtime": 30.0
112+
},
113+
{
114+
"name": "Baselines Database",
115+
"template": "baselines-database-scenarios.yml",
116+
"type": 3,
117+
"target_machines": [
118+
"cobalt-hosted-lin-server",
119+
"cobalt-hosted-lin-server-azure-linux3"
120+
],
121+
"estimated_runtime": 45.0
122+
},
123+
{
124+
"name": "Containers",
125+
"template": "containers-scenarios.yml",
126+
"type": 3,
127+
"target_machines": [
128+
"cobalt-hosted-lin-server",
129+
"cobalt-hosted-lin-server-azure-linux3"
130+
],
131+
"estimated_runtime": 90.0
132+
},
133+
{
134+
"name": "MVC",
135+
"template": "mvc-scenarios.yml",
136+
"type": 3,
137+
"target_machines": [
138+
"cobalt-hosted-lin-server",
139+
"cobalt-hosted-lin-server-azure-linux3"
140+
],
141+
"estimated_runtime": 20.0
142+
},
143+
{
144+
"name": "Trends",
145+
"template": "trend-scenarios.yml",
146+
"type": 2,
147+
"target_machines": [
148+
"cobalt-hosted-lin-server",
149+
"cobalt-hosted-lin-server-azure-linux3"
150+
],
151+
"estimated_runtime": 20.0
152+
},
153+
{
154+
"name": "Trends Database",
155+
"template": "trend-database-scenarios.yml",
156+
"type": 3,
157+
"target_machines": [
158+
"cobalt-hosted-lin-server",
159+
"cobalt-hosted-lin-server-azure-linux3"
160+
],
161+
"estimated_runtime": 15.0
162+
}
163+
]
164+
}

‎build/ci.profile.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,13 @@ profiles:
414414
- warmup
415415
- secondary
416416

417-
cobalt-hosted-lin-app:
417+
#############################################
418+
# #
419+
# COBALT NETWORKED MACHINES #
420+
# #
421+
#############################################
422+
423+
cobalt-hosted-lin-server-app:
418424
variables:
419425
serverAddress: 10.57.32.73
420426
cores: 56
@@ -425,7 +431,7 @@ profiles:
425431
aliases:
426432
- main
427433

428-
cobalt-hosted-lin-load:
434+
cobalt-hosted-lin-client-load:
429435
variables:
430436
secondaryAddress: 10.57.32.72
431437
agents:
@@ -436,7 +442,7 @@ profiles:
436442
- warmup
437443
- secondary
438444

439-
cobalt-hosted-lin-db:
445+
cobalt-hosted-lin-db-db:
440446
variables:
441447
databaseServer: 10.57.32.74
442448
downstreamAddress: 10.57.32.74
@@ -448,7 +454,7 @@ profiles:
448454
- downstream
449455
- extra
450456

451-
cobalt-hosted-al3-lin-app:
457+
cobalt-hosted-lin-server-azure-linux3-app:
452458
variables:
453459
serverAddress: 10.57.32.95
454460
cores: 56
@@ -459,7 +465,7 @@ profiles:
459465
aliases:
460466
- main
461467

462-
cobalt-hosted-al3-lin-load:
468+
cobalt-hosted-lin-client-azure-linux3-load:
463469
variables:
464470
secondaryAddress: 10.57.32.96
465471
agents:
@@ -470,7 +476,7 @@ profiles:
470476
- warmup
471477
- secondary
472478

473-
cobalt-hosted-al3-lin-db:
479+
cobalt-hosted-lin-db-azure-linux3-db:
474480
variables:
475481
databaseServer: 10.57.32.94
476482
downstreamAddress: 10.57.32.94

0 commit comments

Comments
 (0)