Improvements.

Author: rolfbjarne

tests/sampletester/ProcessHelper.cs

@@ -203,6 +203,8 @@ public static void BuildSolution (string solution, string platform, string confi
 		xml.WriteAttributeString ("xamarin-macios-hash", Configuration.TestedHash);
 		xml.WriteAttributeString ("sample-repository", Configuration.GetCurrentRemoteUrl (slndir));
 		xml.WriteAttributeString ("sample-hash", Configuration.GetCurrentHash (slndir));
+		xml.WriteAttributeString ("agent-machinename", Environment.GetEnvironmentVariable ("AGENT_MACHINENAME"));
+		xml.WriteAttributeString ("agent-name", Environment.GetEnvironmentVariable ("AGENT_NAME"));
 		foreach (var app in apps) {
 			xml.WriteStartElement ("test");
 			xml.WriteAttributeString ("name", TestContext.CurrentContext.Test.FullName);
@@ -287,7 +289,6 @@ public static void BuildSolution (string solution, string platform, string confi
 			xml.Dispose ();
 
 			TestContext.AddTestAttachment (logfile, $"Performance data");
-			// Console.WriteLine ("Performance data: {0}:\n\t{1}", logfile, string.Join ("\n\t", File.ReadAllLines (logfile)));
 		}
 	}
 

tools/devops/push-performance-data.sh

@@ -12,15 +12,21 @@ done
 # Merge each individual xml file into one big xml file
 DIR=perf-data/samples/$BUILD_SOURCEBRANCHNAME/$BUILD_SOURCEVERSION
 cd "$DIR"
+# Merge the xml files from each bot into a big per-bot xml file. Don't merge
+# the xml from all the bots together into a single enormous xml file, because
+# it'll be close to GitHub's size limit per file (limit is 100mb, the enormous
+# xml file would be ~80mb now), and might very well pass that one day.
+for job in ./*-*-*-*-*; do
 {
 	echo '<?xml version="1.0" encoding="utf-8" standalone="yes"?>'
-	echo '<performance>'
-	find . -name '*perfdata*.xml' -print0 | xargs -0 -n 1 tail -n +2 | grep -F -v -e '<performance>' -e '</performance>'
+	echo '<performance version="1.0">'
+	find "$job" -name '*perfdata*.xml' -print0 | xargs -0 -n 1 tail -n +2 | grep -F -v -e '<performance>' -e '</performance>'
 	echo '</performance>'
-} > data.xml
+} > "data-$job.xml"
+done
 
-# Add the big xml file to git
-git add data.xml
+# Add the big xml files to git
+git add data-*.xml
 git commit -m "Add performance data for $BUILD_SOURCEBRANCHNAME/$BUILD_SOURCEVERSION."
 
 # Push!