From d94b855e1271a94b2278d15114f42a77329aefd8 Mon Sep 17 00:00:00 2001
From: Jarret Shook <jashoo@microsoft.com>
Date: Wed, 4 Dec 2019 22:17:53 -0800
Subject: [PATCH] Fix linux musl arm64 testing (#523)

* Fix linux musl arm64 testing

1. Increase crossgen-comparion job to 2 hour timeout
2. modify .gitignore to include .devcontainer -> vscode hidden folder

* Update comment
---
 .gitignore                                                  | 1 +
 eng/pipelines/coreclr/templates/crossgen-comparison-job.yml | 4 ++--
 src/coreclr/build-test.sh                                   | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index bf23e45..daead6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -276,6 +276,7 @@ Session.vim
 
 # Visual Studio Code
 .vscode/
+.devcontainer/
 
 # Private test configuration and binaries.
 config.ps1
diff --git a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml
index 7ca96d4..b90d31a 100644
--- a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml
+++ b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml
@@ -66,7 +66,7 @@ jobs:
     container: ${{ parameters.container }}
 
     ${{ if eq(parameters.testGroup, 'innerloop') }}:
-      timeoutInMinutes: 120
+      timeoutInMinutes: 150 # 2.5 hrs
 
     steps:
 
@@ -129,7 +129,7 @@ jobs:
         HelixTargetQueues: ${{ join(' ', parameters.helixQueues) }}
         ${{ if ne(variables['System.TeamProject'], 'internal') }}:
           Creator: $(Creator)
-        WorkItemTimeout: 1:00 # 1 hour
+        WorkItemTimeout: 2:00 # 2 hours
         WorkItemDirectory: '$(artifactsDirectory)'
         CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
         ${{ if ne(parameters.osName, 'Windows_NT') }}:
diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh
index bd5a620..584ea46 100755
--- a/src/coreclr/build-test.sh
+++ b/src/coreclr/build-test.sh
@@ -695,6 +695,10 @@ CORE_ROOT=
 
 source "$__ProjectRoot"/_build-commons.sh
 
+if [ "${__BuildArch}" != "${__HostArch}" ]; then
+    __CrossBuild=1
+fi
+
 # Set dependent variables
 __LogsDir="$__RootBinDir/log"
 __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"
-- 
2.7.4