From 57d35a96418478fe47fe234f4c081f71fc8d960d Mon Sep 17 00:00:00 2001
From: Drew Scoggins <anscoggi@microsoft.com>
Date: Fri, 19 Mar 2021 13:22:55 -0700
Subject: [PATCH] Give AOT mono package arch identifiers (#49893)

---
 eng/pipelines/coreclr/perf.yml               | 22 +++++++++++++++++++++-
 eng/pipelines/coreclr/templates/perf-job.yml |  2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml
index 65c04e3..511db77 100644
--- a/eng/pipelines/coreclr/perf.yml
+++ b/eng/pipelines/coreclr/perf.yml
@@ -117,6 +117,26 @@ jobs:
       runtimeFlavor: mono
       platforms:
       - Linux_x64
+      jobParameters:
+        buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
+        nameSuffix: AOT
+        isOfficialBuild: false
+        extraStepsTemplate: /eng/pipelines/common/upload-artifact-step.yml
+        extraStepsParameters:
+          rootFolder: '$(Build.SourcesDirectory)/artifacts/'
+          includeRootFolder: true
+          displayName: AOT Mono Artifacts
+          artifactName: LinuxMonoAOTx64
+          archiveExtension: '.tar.gz'
+          archiveType: tar
+          tarCompression: gz
+
+  - template: /eng/pipelines/common/platform-matrix.yml
+    parameters:
+      jobTemplate: /eng/pipelines/common/global-build-job.yml
+      buildConfig: release
+      runtimeFlavor: mono
+      platforms:
       - Linux_arm64
       jobParameters:
         buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
@@ -127,7 +147,7 @@ jobs:
           rootFolder: '$(Build.SourcesDirectory)/artifacts/'
           includeRootFolder: true
           displayName: AOT Mono Artifacts
-          artifactName: LinuxMonoAOT
+          artifactName: LinuxMonoAOTarm64
           archiveExtension: '.tar.gz'
           archiveType: tar
           tarCompression: gz
diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml
index dec0d90..5672513 100644
--- a/eng/pipelines/coreclr/templates/perf-job.yml
+++ b/eng/pipelines/coreclr/templates/perf-job.yml
@@ -123,7 +123,7 @@ jobs:
       - template: /eng/pipelines/common/download-artifact-step.yml
         parameters:
           unpackFolder: $(librariesDownloadDir)/LinuxMonoAOT
-          artifactFileName: LinuxMonoAOT.tar.gz
+          artifactFileName: LinuxMonoAOT${{ parameters.archType }}.tar.gz
           artifactName: LinuxMonoAOT
           displayName: AOT Mono Artifacts
 
-- 
2.7.4