Skip to content

Commit

Permalink
Update build docker images to enable NUMA support (dotnet/coreclr#24593)
Browse files Browse the repository at this point in the history
* Update build docker images to enable NUMA  support

So far, the NUMA support for Linux was disabled due to the fact that the
build docker images didn't have libnuma development package installed.
This change updates the images to ones that have the libnuma added that
were created recently.

* Update build job to use Clang5.0 for arm64 everywhere

Our new images for linux-arm64 build have only Clang 5.0 and this change
also aligns the build with linux-musl-arm64.

* Update the clang version used for test builds


Commit migrated from dotnet/coreclr@ac607c3
  • Loading branch information
janvorli authored May 22, 2019
1 parent cc9fa62 commit 550aa57
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion eng/build-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- ${{ if eq(parameters.osGroup, 'FreeBSD') }}:
- name: clangArg
value: '-clang6.0'
- ${{ if and(eq(parameters.osIdentifier, 'Linux_musl'), eq(parameters.archType, 'arm64')) }}:
- ${{ if eq(parameters.archType, 'arm64') }}:
- name: clangArg
value: '-clang5.0'
- ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down
12 changes: 6 additions & 6 deletions eng/pipelines/coreclr/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ variables:
resources:
containers:
- container: ubuntu_1404_arm_cross_build_image
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-e435274-20180426002420
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-1735d26-20190521133857

- container: ubuntu_1604_arm64_cross_build_image
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-a3ae44b-20180315221921
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-cfdd435-20190520220848

- container: musl_x64_build_image
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-WithNode-f4d3fe3-20181220200247
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-WithNode-cfdd435-20190521001804

- container: musl_arm64_build_image
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-406629a-20190403203438
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-406629a-20190520220848

- container: centos7_x64_build_image
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-d485f41-20173404063424
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343

- container: centos6_x64_build_image
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-6-376e1a3-20174311014331
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-6-3e800f1-20190501005338

trigger:
- master
Expand Down
2 changes: 1 addition & 1 deletion eng/test-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- ${{ if eq(parameters.osGroup, 'FreeBSD') }}:
- name: clangArg
value: '-clang6.0'
- ${{ if and(eq(parameters.osIdentifier, 'Linux_musl'), eq(parameters.archType, 'arm64')) }}:
- ${{ if eq(parameters.archType, 'arm64') }}:
- name: clangArg
value: '-clang5.0'

Expand Down

0 comments on commit 550aa57

Please sign in to comment.