From cbc87738d42640f80dcdf5b137d7e4c97edc8780 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Mon, 21 Oct 2024 13:15:03 -0400
Subject: [PATCH] Retry tests if msbuild crashes (#6181)

* Retry tests if msbuild crashes

Issue: https://github.com/dotnet/aspire/issues/6163

* Set MSBUILDDEBUGPATH to help with debugging crashes

* add comment
---
 eng/test-configuration.json          | 3 ++-
 tests/helix/send-to-helix-inner.proj | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/eng/test-configuration.json b/eng/test-configuration.json
index 06a4bdbca6..b77e097afc 100644
--- a/eng/test-configuration.json
+++ b/eng/test-configuration.json
@@ -4,6 +4,7 @@
   "localRerunCount": 1,
   "retryOnRules": [
     { "testName": { "contains": "Aspire.Elastic.Clients.Elasticsearch.Tests.ConformanceTests.HealthCheckReportsExpectedStatus" } },
-    { "testAssembly": { "contains": "Aspire.Elastic.Clients.Elasticsearch.Tests" }, "failureMessage": { "contains": "RemoteExecutionException : Half-way through waiting for remote process." } }
+    { "testAssembly": { "contains": "Aspire.Elastic.Clients.Elasticsearch.Tests" }, "failureMessage": { "contains": "RemoteExecutionException : Half-way through waiting for remote process." } },
+    { "failureMessage" : { "contains" : "MSBUILD : error MSB4166: Child node" } }
   ]
 }
diff --git a/tests/helix/send-to-helix-inner.proj b/tests/helix/send-to-helix-inner.proj
index c75851b508..44ef43776e 100644
--- a/tests/helix/send-to-helix-inner.proj
+++ b/tests/helix/send-to-helix-inner.proj
@@ -142,6 +142,9 @@
     <!-- Disable playwright tests on helix/linux. Issue: https://github.com/dotnet/aspire/issues/4623 -->
     <HelixPreCommand Condition="'$(DisablePlaywrightTests)' == 'true'" Include="$(_EnvVarSetKeyword) DISABLE_PLAYWRIGHT_TESTS=true" />
 
+    <!-- Issue: https://github.com/dotnet/aspire/pull/6181 -->
+    <HelixPreCommand Include="$(_EnvVarSetKeyword) MSBUILDDEBUGPATH=$(_HelixCorrelationPayloadEnvVar)/msbuild-debug" />
+
     <HelixPreCommand Condition="'$(OS)' == 'Windows_NT'" Include="dotnet dev-certs https --trust" />
 
     <HelixPostCommand Include="$(_CleanupProcessesCommand)" />