From 26d42290170932d51f5963005877002b22673112 Mon Sep 17 00:00:00 2001
From: Drew Scoggins <anscoggi@microsoft.com>
Date: Thu, 4 Nov 2021 11:17:41 -0700
Subject: [PATCH 1/2] Add support for custom container for Linux Arm64

Update platform_matrix.yml to allow custom containers for Arm64 Linux runs.
This is required for our performance runs as we need a newer version of the
python runtime. This change follows the same pattern as https://github.com/dotnet/runtime/pull/59202/files
---
 eng/pipelines/common/platform-matrix.yml | 5 ++++-
 eng/pipelines/coreclr/perf_slow.yml      | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
index d58606fc5597d..ad3dbd4db8bc0 100644
--- a/eng/pipelines/common/platform-matrix.yml
+++ b/eng/pipelines/common/platform-matrix.yml
@@ -65,7 +65,10 @@ jobs:
       targetRid: linux-arm64
       platform: Linux_arm64
       container:
-        image: ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
+        ${{ if eq(parameters.container, '') }}:
+          image: ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
+        ${{ if ne(parameters.container, '') }}:
+          image: ${{ parameters.container }}
         registry: mcr
       jobParameters:
         runtimeFlavor: ${{ parameters.runtimeFlavor }}
diff --git a/eng/pipelines/coreclr/perf_slow.yml b/eng/pipelines/coreclr/perf_slow.yml
index 2be7b5345a1a5..6f3a9e3922cc7 100644
--- a/eng/pipelines/coreclr/perf_slow.yml
+++ b/eng/pipelines/coreclr/perf_slow.yml
@@ -98,6 +98,7 @@ jobs:
     parameters:
       jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml
       buildConfig: release
+      container: ubuntu-18.04-cross-arm64-20211022152824-b2c2436
       platforms:
       - Linux_arm64
       - windows_arm64
@@ -154,6 +155,9 @@ jobs:
       runtimeFlavor: aot
       platforms:
       - Linux_arm64
+      container:
+        image: ubuntu-18.04-cross-20211022152824-f853169
+        registry: mcr
       jobParameters:
         testGroup: perf
         liveLibrariesBuildConfig: Release
@@ -172,6 +176,7 @@ jobs:
       runtimeFlavor: coreclr
       platforms:
       - Linux_arm64
+      container: ubuntu-18.04-cross-arm64-20211022152824-b2c2436
       jobParameters:
         testGroup: perf
         liveLibrariesBuildConfig: Release

From baa5f20cd7b8c981fe517d621eead54c7bc2dcc1 Mon Sep 17 00:00:00 2001
From: Drew Scoggins <anscoggi@microsoft.com>
Date: Wed, 17 Nov 2021 09:22:40 -0800
Subject: [PATCH 2/2] Update perf_slow.yml with correct container values

---
 eng/pipelines/coreclr/perf_slow.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/coreclr/perf_slow.yml b/eng/pipelines/coreclr/perf_slow.yml
index 6f3a9e3922cc7..e8410af6d361f 100644
--- a/eng/pipelines/coreclr/perf_slow.yml
+++ b/eng/pipelines/coreclr/perf_slow.yml
@@ -39,6 +39,7 @@ jobs:
       jobTemplate: /eng/pipelines/mono/templates/build-job.yml
       runtimeFlavor: mono
       buildConfig: release
+      container: ubuntu-18.04-cross-arm64-20211022152824-b2c2436
       platforms:
       - Linux_arm64
 
@@ -47,6 +48,7 @@ jobs:
     parameters:
       jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml
       buildConfig: release
+      container: ubuntu-18.04-cross-arm64-20211022152824-b2c2436
       platforms:
       - Linux_arm64
       jobParameters:
@@ -58,6 +60,7 @@ jobs:
       jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml
       buildConfig: release
       runtimeFlavor: mono
+      container: ubuntu-18.04-cross-arm64-20211022152824-b2c2436
       platforms:
       - Linux_arm64
       jobParameters:
@@ -76,6 +79,7 @@ jobs:
       jobTemplate: /eng/pipelines/common/global-build-job.yml
       buildConfig: release
       runtimeFlavor: mono
+      container: ubuntu-18.04-cross-arm64-20211022152824-b2c2436
       platforms:
       - Browser_wasm
       jobParameters:
@@ -110,6 +114,7 @@ jobs:
     parameters:
       jobTemplate: /eng/pipelines/common/global-build-job.yml
       buildConfig: release
+      container: ubuntu-18.04-cross-arm64-20211022152824-b2c2436
       runtimeFlavor: mono
       platforms:
       - Browser_wasm
@@ -130,6 +135,7 @@ jobs:
     parameters:
       jobTemplate: /eng/pipelines/common/global-build-job.yml
       buildConfig: release
+      container: ubuntu-18.04-cross-arm64-20211022152824-b2c2436
       runtimeFlavor: mono
       platforms:
       - Linux_arm64
@@ -155,9 +161,7 @@ jobs:
       runtimeFlavor: aot
       platforms:
       - Linux_arm64
-      container:
-        image: ubuntu-18.04-cross-20211022152824-f853169
-        registry: mcr
+      container: ubuntu-18.04-cross-arm64-20211022152824-b2c2436
       jobParameters:
         testGroup: perf
         liveLibrariesBuildConfig: Release