Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update centos7 image to net image #3004

Merged
merged 8 commits into from
May 10, 2023
Merged

Update centos7 image to net image #3004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3503d77
Try changing centos 7 to use mariner 2.0.
LoopedBard3 May 3, 2023
064acfb
Setup testing for only mariner.
LoopedBard3 May 3, 2023
a1afeec
Try a more specific image.
LoopedBard3 May 8, 2023
11c974c
Try ubuntu to see if the nativeaot scenarios work on it.
LoopedBard3 May 8, 2023
e543d63
Revert "Setup testing for only mariner."
LoopedBard3 May 9, 2023
b283f22
Merge branch 'SwitchFromCentosToMariner' of https://github.com/Looped…
LoopedBard3 May 9, 2023
45d51d5
Remove Centos/Mariner build machine as it is not used if this PR is m…
LoopedBard3 May 9, 2023
f1295e2
Try to fix name collision.
LoopedBard3 May 9, 2023
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
24 changes: 11 additions & 13 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ resources:
containers:
- container: ubuntu_x64_build_container
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04
- container: centos_x64_build_container
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7

# CI Trigger on main branch
trigger:
Expand Down Expand Up @@ -125,7 +123,6 @@ jobs:
buildMachines:
- win-x64
- win-x86
- ubuntu-x64
isPublic: true
jobParameters:
kind: micro
Expand All @@ -134,33 +131,34 @@ jobs:
channels:
- main

# net462 micro benchmarks
# Ubuntux64 Default and NativeAOT micro benchmarks
- template: /eng/performance/build_machine_matrix.yml
parameters:
jobTemplate: /eng/performance/benchmark_jobs.yml
buildMachines:
- win-rs5-x64
- ubuntu-x64
isPublic: true
jobParameters:
kind: micro_net462
kind: micro
csproj: src\benchmarks\micro\MicroBenchmarks.csproj
runCategories: 'runtime libraries'
runCategories: 'runtime libraries'
channels:
- net462
- main
- nativeaot8.0

# NativeAOT micro benchmarks
# net462 micro benchmarks
- template: /eng/performance/build_machine_matrix.yml
parameters:
jobTemplate: /eng/performance/benchmark_jobs.yml
buildMachines:
- centos-x64
- win-rs5-x64
isPublic: true
jobParameters:
kind: micro
kind: micro_net462
csproj: src\benchmarks\micro\MicroBenchmarks.csproj
runCategories: 'runtime libraries'
runCategories: 'runtime libraries'
channels:
- nativeaot8.0
- net462

# ML.NET benchmarks
- template: /eng/performance/build_machine_matrix.yml
Expand Down
13 changes: 0 additions & 13 deletions eng/performance/build_machine_matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,6 @@ jobs:
machinePool: Tiger
queue: Ubuntu.1804.Amd64.Tiger.Perf # using a dedicated private Helix queue (perftigers)

- ${{ if and(containsValue(parameters.buildMachines, 'centos-x64'), eq(parameters.isPublic, true)) }}: # centos only used in public builds currently
- template: ${{ parameters.jobTemplate }}
parameters:
osName: centos
osVersion: 7
architecture: x64
pool:
vmImage: ubuntu-latest
machinePool: Open
queue: centos.7.amd64.open
container: centos_x64_build_container
${{ insert }}: ${{ parameters.jobParameters }}

- ${{ if and(containsValue(parameters.buildMachines, 'win-arm64'), not(eq(parameters.isPublic, true))) }}: # Windows ARM64 only used in private builds currently
- template: ${{ parameters.jobTemplate }}
parameters:
Expand Down