From a1e65761b6cd64b391c2f0ee4da1b219f93c5d33 Mon Sep 17 00:00:00 2001
From: Michelle McDaniel <adiaaida@gmail.com>
Date: Mon, 26 Nov 2018 08:31:30 -0800
Subject: [PATCH] Tar arm build outputs to workaround unicode issues (#21127)

---
 perf.groovy | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/perf.groovy b/perf.groovy
index d01c9d9..9e932de 100644
--- a/perf.groovy
+++ b/perf.groovy
@@ -457,6 +457,7 @@ def static getFullThroughputJobName(def project, def os, def arch, def isPR) {
         
         def crossCompile = ""
         def python = "python3.5"
+        def tgzFile = "bin-Product-Linux.${architecture}.${configuration}.tgz"
 
         if (architecture == "arm") {
             python = "python3.6"
@@ -471,6 +472,7 @@ def static getFullThroughputJobName(def project, def os, def arch, def isPR) {
                 steps {
                     buildCommands.each { buildCommand ->
                         shell(buildCommand)
+                        shell("tar -czf ${tgzFile} bin/Product/Linux.${architecture}.${configuration}")
                     }
                 }
 
@@ -482,7 +484,7 @@ def static getFullThroughputJobName(def project, def os, def arch, def isPR) {
             }
             Utilities.setMachineAffinity(newBuildJob, "Ubuntu16.04", 'latest-or-auto')
             Utilities.standardJobSetup(newBuildJob, project, isPR, "*/${branch}")
-            Utilities.addArchival(newBuildJob, "bin/Product/**")
+            Utilities.addArchival(newBuildJob, "${tgzFile}")
         }
         else {
             // Build has to happen on RHEL7.2 (that's where we produce the bits we ship)
@@ -547,11 +549,19 @@ def static getFullThroughputJobName(def project, def os, def arch, def isPR) {
                     steps {
                         shell("bash ./tests/scripts/perf-prep.sh --throughput${archString}")
                         copyArtifacts(fullBuildJobName) {
-                            includePatterns("bin/Product/**")
+                            if (architecture == 'arm') {
+                                includePatterns("${tgzFile}")
+                            }
+                            else {
+                                includePatterns("bin/Product/**")
+                            }
                             buildSelector {
                                 buildNumber('\${PRODUCT_BUILD}')
                             }
                         }
+                        if (architecture == 'arm') {
+                            shell("tar -xzf ./${tgzFile} || exit 0")
+                        }
                         shell("GIT_BRANCH_WITHOUT_ORIGIN=\$(echo \$GIT_BRANCH | sed \"s/[^/]*\\/\\(.*\\)/\\1 /\")\n" +
                         "${python} \"\${WORKSPACE}/tests/scripts/Microsoft.BenchView.JSONFormat/tools/submission-metadata.py\" --name \" ${benchViewName} \" --user-email \"dotnet-bot@microsoft.com\"\n" +
                         "${python} \"\${WORKSPACE}/tests/scripts/Microsoft.BenchView.JSONFormat/tools/build.py\" git --branch \$GIT_BRANCH_WITHOUT_ORIGIN --type ${runType}")
-- 
2.7.4