Skip to content

Commit

Permalink
Try changing centos 7 to use mariner 2.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
LoopedBard3 committed May 3, 2023
1 parent 6dccc99 commit 3503d77
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ 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
- container: mariner_x64_build_container
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0

# CI Trigger on main branch
trigger:
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
parameters:
jobTemplate: /eng/performance/benchmark_jobs.yml
buildMachines:
- centos-x64
- mariner-x64
isPublic: true
jobParameters:
kind: micro
Expand Down
10 changes: 5 additions & 5 deletions eng/performance/build_machine_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,17 @@ 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
- ${{ if and(containsValue(parameters.buildMachines, 'mariner-x64'), eq(parameters.isPublic, true)) }}: # mariner only used in public builds currently
- template: ${{ parameters.jobTemplate }}
parameters:
osName: centos
osVersion: 7
osName: mariner
osVersion: 2
architecture: x64
pool:
vmImage: ubuntu-latest
machinePool: Open
queue: centos.7.amd64.open
container: centos_x64_build_container
queue: mariner.2.amd64.open
container: mariner_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
Expand Down

0 comments on commit 3503d77

Please sign in to comment.