diff options
| author | Jo Shields <joshield@microsoft.com> | 2021-03-02 15:50:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 15:50:19 +0300 |
| commit | a5cf6b825d6fb9f27a2d513113f4c4536fff3096 (patch) | |
| tree | e6b3c0c1664ce075457a5ef6507fb7aed37df49e | |
| parent | 1ed1688a543c0c03f8fc0cc8e6ca234a6bd45eb0 (diff) | |
Add an ARMv7 lane, which runs on our AARCH64 pool (#20881)
* Add an ARMv7 lane, which runs on our AARCH64 pool
* Increase ARMv7 timeout to 3 hours. It doesn't quite finish in 2.
* Update Docker image (now with added ping)
| -rw-r--r-- | scripts/ci/mono-ci-job-template.yml | 8 | ||||
| -rw-r--r-- | scripts/ci/mono-ci.yml | 10 |
2 files changed, 17 insertions, 1 deletions
diff --git a/scripts/ci/mono-ci-job-template.yml b/scripts/ci/mono-ci-job-template.yml index 12e215fbb48..4451c651b6e 100644 --- a/scripts/ci/mono-ci-job-template.yml +++ b/scripts/ci/mono-ci-job-template.yml @@ -24,10 +24,12 @@ jobs: pool: ${{ if eq(parameters.os, 'osx') }}: vmImage: macos-10.15 - ${{ if and(eq(parameters.os, 'linux'),ne(parameters.arch, 'aarch64')) }}: + ${{ if and(eq(parameters.os, 'linux'),eq(parameters.arch, 'amd64')) }}: vmImage: ubuntu-20.04 ${{ if and(eq(parameters.os, 'linux'),eq(parameters.arch, 'aarch64')) }}: name: MonoARM64 + ${{ if and(eq(parameters.os, 'linux'),eq(parameters.arch, 'armhf')) }}: + name: MonoARM64 ${{ if and(eq(parameters.os, 'linux'), eq(parameters.arch, 'i386')) }}: container: image: i386/ubuntu:20.04 @@ -36,6 +38,10 @@ jobs: container: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-a45aeeb-20190620155855 options: --platform linux/arm64 --user 0:0 + ${{ if and(eq(parameters.os, 'linux'), eq(parameters.arch, 'armhf')) }}: + container: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mono-arm32v7-20210301133940-7b1af2f + options: --platform linux/arm/v7 --user 0:0 timeoutInMinutes: ${{ parameters.timeoutInMinutes }} steps: - checkout: self diff --git a/scripts/ci/mono-ci.yml b/scripts/ci/mono-ci.yml index 32bd9c572a5..969f2049729 100644 --- a/scripts/ci/mono-ci.yml +++ b/scripts/ci/mono-ci.yml @@ -50,6 +50,16 @@ variables: jobs: # +# Linux armv7 +# +- template: /scripts/ci/mono-ci-job-template.yml + parameters: + displayName: Linux ARM Hard Float + os: linux + arch: armhf + timeoutInMinutes: 180 + +# # Linux aarch64 # - template: /scripts/ci/mono-ci-job-template.yml |