Skip to content

Commit 0deb349

Browse files
LoopedBard3LoopedBard3
committed
Remove CitrineAMD as it has been decommissioned.
1 parent b078eec commit 0deb349

File tree

6 files changed

+62
-135
lines changed

6 files changed

+62
-135
lines changed

‎build/ci.profile.yml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -175,27 +175,6 @@ profiles:
175175
- warmup
176176
- secondary
177177

178-
amd-lin-app:
179-
variables:
180-
serverAddress: 10.0.0.106
181-
cores: 48
182-
agents:
183-
application:
184-
endpoints:
185-
- http://asp-citrine-amd:5001
186-
aliases:
187-
- main
188-
189-
amd-lin-load:
190-
variables:
191-
secondaryAddress: 10.0.0.106
192-
agents:
193-
load:
194-
endpoints:
195-
- http://asp-citrine-amd:5001
196-
aliases:
197-
- warmup
198-
- secondary
199178

200179
amd-lin2-app:
201180
variables:

‎scenarios/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ Each profile defines a set of machines, private IPs and ports that are used to r
3434
| `aspnet-perf-win` | INTEL, 12 logical cores, 1 socket, 32GB | Windows Server 2022 | Intel(R) Xeon(R) E-2336 CPU @ 2.90GHz |
3535
| `aspnet-citrine-lin` | INTEL, logical 28 cores, 1 socket, 32GB | Ubuntu 20.04, Kernel 5.4.0 | Intel(R) Xeon(R) Gold 5120 CPU @ 2.20GHz |
3636
| `aspnet-citrine-win` | INTEL, logical 28 cores, 1 socket, 32GB | Windows Server 2022 | Intel(R) Xeon(R) Gold 5120 CPU @ 2.20GHz |
37-
| `aspnet-citrine-amd` | AMD, logical 48 cores, 1 socket, 64GB, 1 NUMA | Ubuntu 20.04, Kernel 5.4.0 | AMD EPYC 7402P 24-Core Processor |
3837
| `aspnet-citrine-amd2` | AMD, logical 48 cores, 1 socket, 64GB, 4 NUMA | Ubuntu 20.04, Kernel 5.4.0 | AMD EPYC 7402P 24-Core Processor |
38+
39+
> Note: The previous `aspnet-citrine-amd` profile has been removed (hardware decommissioned). Use `aspnet-citrine-amd2` for equivalent scenarios.
3940
| `aspnet-citrine-arm-lin` | ARM64, 80 logical cores, 1 socket, 1 NUMA, 128 GB | Ubuntu 20.04, Kernel 5.4.0 | Neoverse-N1 |
4041
| `aspnet-gold-lin` | INTEL, 56 logical cores, 1 socket, 1 NUMA, 64 GB | Ubuntu 22.04, Kernel 6.8.0-45-generic | Intel(R) Xeon(R) Gold 6330 CPU @ 2.00GHz |
4142
| `aspnet-gold-win` | INTEL, 56 logical cores, 1 socket, 1 NUMA, 64 GB | Windows Server 2022 | Intel(R) Xeon(R) Gold 6330 CPU @ 2.00GHz |

‎scenarios/aspnet.profiles.standard.yml‎

Lines changed: 41 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,10 @@ profiles:
164164
variables:
165165
mainAddress: 10.0.0.108
166166
secondaryAddress: 10.0.0.109
167-
extraAddress: 10.0.0.106
167+
extraAddress: 10.0.0.103
168168
serverAddress: 10.0.0.108
169-
databaseServer: 10.0.0.106
170-
downstreamAddress: 10.0.0.106
169+
databaseServer: 10.0.0.103
170+
downstreamAddress: 10.0.0.103
171171
cores: 80
172172
agents:
173173
main:
@@ -183,7 +183,7 @@ profiles:
183183
- warmup
184184
extra:
185185
endpoints:
186-
- http://asp-citrine-amd:5001
186+
- http://asp-citrine-db:5001
187187
aliases:
188188
- db
189189
- downstream
@@ -192,10 +192,10 @@ profiles:
192192
variables:
193193
mainAddress: 10.0.0.108
194194
secondaryAddress: 10.0.0.109
195-
extraAddress: 10.0.0.106
195+
extraAddress: 10.0.0.103
196196
serverAddress: 10.0.0.108
197-
databaseServer: 10.0.0.106
198-
downstreamAddress: 10.0.0.106
197+
databaseServer: 10.0.0.103
198+
downstreamAddress: 10.0.0.103
199199
cores: 80
200200
agents:
201201
main:
@@ -211,19 +211,19 @@ profiles:
211211
- warmup
212212
extra:
213213
endpoints:
214-
- https://aspnetperf.servicebus.windows.net/citrineamd
214+
- https://aspnetperf.servicebus.windows.net/citrinedb
215215
aliases:
216216
- db
217217
- downstream
218218

219219
aspnet-citrine-arm-win:
220220
variables:
221221
mainAddress: 10.0.0.110
222-
secondaryAddress: 10.0.0.106
222+
secondaryAddress: 10.0.0.105
223223
extraAddress: 10.0.0.109
224224
serverAddress: 10.0.0.110
225-
databaseServer: 10.0.0.109
226-
downstreamAddress: 10.0.0.109
225+
databaseServer: 10.0.0.103
226+
downstreamAddress: 10.0.0.103
227227
cores: 80
228228
agents:
229229
main:
@@ -233,25 +233,25 @@ profiles:
233233
- application
234234
secondary:
235235
endpoints:
236-
- http://asp-citrine-amd:5001
236+
- http://asp-citrine-load:5001
237237
aliases:
238238
- load
239239
- warmup
240240
extra:
241241
endpoints:
242-
- http://asp-citrine-amd2:5001
242+
- http://asp-citrine-db:5001
243243
aliases:
244244
- db
245245
- downstream
246246

247247
aspnet-citrine-arm-win-relay:
248248
variables:
249249
mainAddress: 10.0.0.110
250-
secondaryAddress: 10.0.0.106
251-
extraAddress: 10.0.0.109
250+
secondaryAddress: 10.0.0.105
251+
extraAddress: 10.0.0.103
252252
serverAddress: 10.0.0.110
253-
databaseServer: 10.0.0.109
254-
downstreamAddress: 10.0.0.109
253+
databaseServer: 10.0.0.103
254+
downstreamAddress: 10.0.0.103
255255
cores: 80
256256
agents:
257257
main:
@@ -261,13 +261,13 @@ profiles:
261261
- application
262262
secondary:
263263
endpoints:
264-
- https://aspnetperf.servicebus.windows.net/citrineamd
264+
- https://aspnetperf.servicebus.windows.net/citrineload
265265
aliases:
266266
- load
267267
- warmup
268268
extra:
269269
endpoints:
270-
- https://aspnetperf.servicebus.windows.net/citrineamd2
270+
- https://aspnetperf.servicebus.windows.net/citrinedb
271271
aliases:
272272
- db
273273
- downstream
@@ -300,47 +300,19 @@ profiles:
300300
- db
301301
- downstream
302302

303-
aspnet-citrine-amd:
304-
variables:
305-
mainAddress: 10.0.0.106
306-
secondaryAddress: 10.0.0.103
307-
extraAddress: 10.0.0.105
308-
serverAddress: 10.0.0.106
309-
databaseServer: 10.0.0.105
310-
downstreamAddress: 10.0.0.105
311-
cores: 48
312-
agents:
313-
main:
314-
endpoints:
315-
- http://asp-citrine-amd:5001
316-
aliases:
317-
- application
318-
secondary:
319-
endpoints:
320-
- http://asp-citrine-db:5001
321-
aliases:
322-
- load
323-
- warmup
324-
extra:
325-
endpoints:
326-
- http://asp-citrine-load:5001
327-
aliases:
328-
- db
329-
- downstream
330-
331303
aspnet-citrine-amd-relay:
332304
variables:
333-
mainAddress: 10.0.0.106
305+
mainAddress: 10.0.0.109
334306
secondaryAddress: 10.0.0.103
335307
extraAddress: 10.0.0.105
336-
serverAddress: 10.0.0.106
308+
serverAddress: 10.0.0.109
337309
databaseServer: 10.0.0.105
338310
downstreamAddress: 10.0.0.105
339311
cores: 48
340312
agents:
341313
main:
342314
endpoints:
343-
- https://aspnetperf.servicebus.windows.net/citrineamd
315+
- https://aspnetperf.servicebus.windows.net/citrineamd2
344316
aliases:
345317
- application
346318
secondary:
@@ -360,10 +332,10 @@ profiles:
360332
variables:
361333
mainAddress: 10.0.0.102
362334
secondaryAddress: 10.0.0.105
363-
extraAddress: 10.0.0.106
335+
extraAddress: 10.0.0.103
364336
serverAddress: 10.0.0.102
365-
databaseServer: 10.0.0.106
366-
downstreamAddress: 10.0.0.106
337+
databaseServer: 10.0.0.103
338+
downstreamAddress: 10.0.0.103
367339
cores: 12
368340
agents:
369341
main:
@@ -388,10 +360,10 @@ profiles:
388360
variables:
389361
mainAddress: 10.0.0.102
390362
secondaryAddress: 10.0.0.105
391-
extraAddress: 10.0.0.106
363+
extraAddress: 10.0.0.103
392364
serverAddress: 10.0.0.102
393-
databaseServer: 10.0.0.106
394-
downstreamAddress: 10.0.0.106
365+
databaseServer: 10.0.0.103
366+
downstreamAddress: 10.0.0.103
395367
cores: 12
396368
agents:
397369
main:
@@ -415,8 +387,8 @@ profiles:
415387
aspnet-perf-win:
416388
variables:
417389
mainAddress: 10.0.0.110
418-
secondaryAddress: 10.0.0.106
419-
extraAddress: 10.0.0.105
390+
secondaryAddress: 10.0.0.105
391+
extraAddress: 10.0.0.103
420392
serverAddress: 10.0.0.110
421393
databaseServer: 10.0.0.105
422394
downstreamAddress: 10.0.0.105
@@ -444,10 +416,10 @@ profiles:
444416
variables:
445417
mainAddress: 10.0.0.110
446418
secondaryAddress: 10.0.0.105
447-
extraAddress: 10.0.0.106
419+
extraAddress: 10.0.0.103
448420
serverAddress: 10.0.0.110
449-
databaseServer: 10.0.0.106
450-
downstreamAddress: 10.0.0.106
421+
databaseServer: 10.0.0.103
422+
downstreamAddress: 10.0.0.103
451423
cores: 12
452424
agents:
453425
main:
@@ -584,10 +556,10 @@ profiles:
584556
variables:
585557
mainAddress: 10.0.0.111
586558
secondaryAddress: 10.0.0.109
587-
extraAddress: 10.0.0.106
559+
extraAddress: 10.0.0.103
588560
serverAddress: 10.0.0.111
589-
databaseServer: 10.0.0.106
590-
downstreamAddress: 10.0.0.106
561+
databaseServer: 10.0.0.103
562+
downstreamAddress: 10.0.0.103
591563
cores: 128
592564
agents:
593565
main:
@@ -603,7 +575,7 @@ profiles:
603575
- warmup
604576
extra:
605577
endpoints:
606-
- http://asp-citrine-amd:5001
578+
- http://asp-citrine-db:5001
607579
aliases:
608580
- db
609581
- downstream
@@ -612,10 +584,10 @@ profiles:
612584
variables:
613585
mainAddress: 10.0.0.111
614586
secondaryAddress: 10.0.0.109
615-
extraAddress: 10.0.0.106
587+
extraAddress: 10.0.0.103
616588
serverAddress: 10.0.0.111
617-
databaseServer: 10.0.0.106
618-
downstreamAddress: 10.0.0.106
589+
databaseServer: 10.0.0.103
590+
downstreamAddress: 10.0.0.103
619591
cores: 128
620592
agents:
621593
main:
@@ -631,7 +603,7 @@ profiles:
631603
- warmup
632604
extra:
633605
endpoints:
634-
- https://aspnetperf.servicebus.windows.net/citrineamd
606+
- https://aspnetperf.servicebus.windows.net/citrinedb
635607
aliases:
636608
- db
637609
- downstream

0 commit comments

Comments
 (0)