Skip to content

Fix NativeAOT runs to include db machines. #2101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions build/benchmarks-ci-01.yml
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ jobs:
connection: ASPNET Benchmarks Service Bus
serviceBusQueueName: mono
serviceBusNamespace: aspnetbenchmarks
arguments: "$(ciProfile) --profile gold-win-app --profile gold-load2-load "
arguments: "$(ciProfile) --profile gold-win-app --profile gold-load2-load --profile gold-db-db "

# GROUP 5

Expand Down Expand Up @@ -303,7 +303,7 @@ jobs:
connection: ASPNET Benchmarks Service Bus
serviceBusQueueName: citrine3
serviceBusNamespace: aspnetbenchmarks
arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load "
arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load --profile intel-db-db "

- job: Trends_Gold_Win
displayName: 5- Trends Gold Win
Expand Down Expand Up @@ -333,7 +333,7 @@ jobs:
connection: ASPNET Benchmarks Service Bus
serviceBusQueueName: citrine1
serviceBusNamespace: aspnetbenchmarks
arguments: "$(ciProfile) --profile gold-lin-app --profile gold-load-load "
arguments: "$(ciProfile) --profile gold-lin-app --profile gold-load-load --profile gold-db-db "

- job: NativeAOT_Intel_Lin
displayName: 6- NativeAOT Intel Lin
Expand All @@ -347,24 +347,24 @@ jobs:
connection: ASPNET Benchmarks Service Bus
serviceBusQueueName: citrine2
serviceBusNamespace: aspnetbenchmarks
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load "
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-db-db "

- job: Frameworks_Amd_Lin2
displayName: 6- Frameworks Amd Lin2
- job: GC_Gold_Win
displayName: 6- GC Gold Win
pool: server
timeoutInMinutes: 120
dependsOn: [SignalR_Gold_Lin, SignalR_Intel_Lin, NativeAOT_Intel_Win, Trends_Gold_Win]
condition: succeededOrFailed()
steps:
- template: frameworks-scenarios.yml
- template: gc-scenarios.yml
parameters:
connection: ASPNET Benchmarks Service Bus
serviceBusQueueName: citrine3
serviceBusNamespace: aspnetbenchmarks
arguments: "$(ciProfile) --profile amd-lin2-app --profile intel-load2-load --profile intel-db-db "
arguments: "$(ciProfile) --profile gold-win-app "

- job: GC_Gold_Win
displayName: 6- GC Gold Win
- job: GC_Intel_Win
displayName: 6- GC Intel Win
pool: server
timeoutInMinutes: 120
dependsOn: [SignalR_Gold_Lin, SignalR_Intel_Lin, NativeAOT_Intel_Win, Trends_Gold_Win]
Expand All @@ -375,15 +375,15 @@ jobs:
connection: ASPNET Benchmarks Service Bus
serviceBusQueueName: mono
serviceBusNamespace: aspnetbenchmarks
arguments: "$(ciProfile) --profile gold-win-app "
arguments: "$(ciProfile) --profile intel-win-app "

# GROUP 7

- job: Frameworks_Gold_Lin
displayName: 7- Frameworks Gold Lin
pool: server
timeoutInMinutes: 120
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, Frameworks_Amd_Lin2, GC_Gold_Win]
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, GC_Gold_Win, GC_Intel_Win]
condition: succeededOrFailed()
steps:
- template: frameworks-scenarios.yml
Expand All @@ -397,7 +397,7 @@ jobs:
displayName: 7- Frameworks Intel Lin
pool: server
timeoutInMinutes: 120
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, Frameworks_Amd_Lin2, GC_Gold_Win]
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, GC_Gold_Win, GC_Intel_Win]
condition: succeededOrFailed()
steps:
- template: frameworks-scenarios.yml
Expand All @@ -411,7 +411,7 @@ jobs:
displayName: 7- Single File Gold Win
pool: server
timeoutInMinutes: 120
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, Frameworks_Amd_Lin2, GC_Gold_Win]
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, GC_Gold_Win, GC_Intel_Win]
condition: succeededOrFailed()
steps:
- template: singlefile-scenarios.yml
Expand All @@ -425,7 +425,7 @@ jobs:
displayName: 7- Single File Intel Win
pool: server
timeoutInMinutes: 120
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, Frameworks_Amd_Lin2, GC_Gold_Win]
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, GC_Gold_Win, GC_Intel_Win]
condition: succeededOrFailed()
steps:
- template: singlefile-scenarios.yml
Expand Down
16 changes: 8 additions & 8 deletions build/benchmarks-ci-02.yml
Original file line number Diff line number Diff line change
Expand Up @@ -465,19 +465,19 @@ jobs:
serviceBusNamespace: aspnetbenchmarks
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load "

- job: GC_Intel_Win
displayName: 8- GC Intel Win
- job: Frameworks_Amd_Lin2
displayName: 8- Frameworks Amd Lin2
pool: server
timeoutInMinutes: 120
dependsOn: [MVC_Gold_Lin, MVC_Intel_Lin, EF_Core_Gold_Win, EF_Core_Intel_Win]
condition: succeededOrFailed()
steps:
- template: gc-scenarios.yml
- template: frameworks-scenarios.yml
parameters:
connection: ASPNET Benchmarks Service Bus
serviceBusQueueName: citrine3
serviceBusNamespace: aspnetbenchmarks
arguments: "$(ciProfile) --profile intel-win-app "
arguments: "$(ciProfile) --profile amd-lin2-app --profile intel-load2-load --profile intel-db-db "

- job: Trends_Database_Gold_Win
displayName: 8- Trends Database Gold Win
Expand All @@ -499,7 +499,7 @@ jobs:
displayName: 9- GC Gold Lin
pool: server
timeoutInMinutes: 120
dependsOn: [Trends_Gold_Lin, Trends_Intel_Lin, GC_Intel_Win, Trends_Database_Gold_Win]
dependsOn: [Trends_Gold_Lin, Trends_Intel_Lin, Frameworks_Amd_Lin2, Trends_Database_Gold_Win]
condition: succeededOrFailed()
steps:
- template: gc-scenarios.yml
Expand All @@ -513,7 +513,7 @@ jobs:
displayName: 9- GC Intel Lin
pool: server
timeoutInMinutes: 120
dependsOn: [Trends_Gold_Lin, Trends_Intel_Lin, GC_Intel_Win, Trends_Database_Gold_Win]
dependsOn: [Trends_Gold_Lin, Trends_Intel_Lin, Frameworks_Amd_Lin2, Trends_Database_Gold_Win]
condition: succeededOrFailed()
steps:
- template: gc-scenarios.yml
Expand All @@ -527,7 +527,7 @@ jobs:
displayName: 9- Trends Database Intel Win
pool: server
timeoutInMinutes: 120
dependsOn: [Trends_Gold_Lin, Trends_Intel_Lin, GC_Intel_Win, Trends_Database_Gold_Win]
dependsOn: [Trends_Gold_Lin, Trends_Intel_Lin, Frameworks_Amd_Lin2, Trends_Database_Gold_Win]
condition: succeededOrFailed()
steps:
- template: trend-database-scenarios.yml
Expand All @@ -541,7 +541,7 @@ jobs:
displayName: 9- Trends Database Amd Lin2
pool: server
timeoutInMinutes: 120
dependsOn: [Trends_Gold_Lin, Trends_Intel_Lin, GC_Intel_Win, Trends_Database_Gold_Win]
dependsOn: [Trends_Gold_Lin, Trends_Intel_Lin, Frameworks_Amd_Lin2, Trends_Database_Gold_Win]
condition: succeededOrFailed()
steps:
- template: trend-database-scenarios.yml
Expand Down
2 changes: 1 addition & 1 deletion build/benchmarks_ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
{
"name": "NativeAOT",
"template": "nativeaot-scenarios.yml",
"type": 2,
"type": 3,
"target_machines": [
"gold-lin",
"gold-win",
Expand Down
Loading