Use ubuntu image for NativeAOT benchmarks (#3004)

dotnet · May 10, 2023 · 51a0ba0 · 51a0ba0
1 parent ca0ca94
commit 51a0ba0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 26 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -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:
@@ -125,7 +123,6 @@ jobs:
       buildMachines:
         - win-x64
         - win-x86
-        - ubuntu-x64
       isPublic: true
       jobParameters:
         kind: micro
@@ -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

diff --git a/eng/performance/build_machine_matrix.yml b/eng/performance/build_machine_matrix.yml
@@ -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: