From de33997760516cf44ce4114d5ee39dc59f8c9d51 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Thu, 30 Jan 2020 11:33:59 -0800 Subject: [PATCH] Update alpine arm64 image (#2370) --- eng/pipelines/common/platform-matrix.yml | 2 +- eng/pipelines/libraries/helix-queues-setup.yml | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index dcaaf8a..faef410 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -119,7 +119,7 @@ jobs: archType: arm64 platform: Linux_musl_arm64 container: - image: ubuntu-16.04-cross-arm64-alpine-406629a-20200121150126 + image: ubuntu-16.04-cross-arm64-alpine-406629a-20200127195039 registry: mcr jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 9408eac..4afcab5 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -39,11 +39,10 @@ jobs: - (Alpine.310.Amd64.Open)ubuntu.1604.amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.10-helix-bfcd90a-20200123191054 - (Alpine.311.Amd64.Open)ubuntu.1604.amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.11-helix-bfcd90a-20200123191053 - # Issue tracking this being re-enabled https://github.com/dotnet/runtime/issues/1723 # Linux musl arm64 - #- ${{ if eq(parameters.platform, 'Linux_musl_arm64') }}: - # - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}: - # - (Alpine.38.Arm64.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-a45aeeb-20190620184035 + - ${{ if eq(parameters.platform, 'Linux_musl_arm64') }}: + - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}: + - (Alpine.38.Arm64.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-a45aeeb-20190620184035 # Linux x64 - ${{ if eq(parameters.platform, 'Linux_x64') }}: -- 2.7.4