Reorganize identifying information into subdirectories for easier navigation

Commit migrated from https://github.com/dotnet/corefx/commit/37f642a847e0026fe1a19b0fd74fe8868a03984c

diff --git a/src/libraries/upload-tests.proj b/src/libraries/upload-tests.proj
index 45ccdc7..fbd756f 100644 (file)
--- a/src/libraries/upload-tests.proj
+++ b/src/libraries/upload-tests.proj
@@ -77,10 +77,10 @@
     <HelixArchLabel>$(ArchGroup)</HelixArchLabel>
     <HelixConfigLabel>$(ConfigurationGroup)</HelixConfigLabel>
     <MaxRetryCount>1</MaxRetryCount>
-    <!-- Unique container name and blob prefix per build and configuration, e.g., corefx-beta-12345-01/tests-master-windowsnt-x64-netcoreapp-master -->
+    <!-- Unique container name and blob prefix per build and configuration, e.g., corefx-tests/master/beta-12345-01/netcoreapp/windowsnt-x64 -->
     <!-- Azure Storage containers can only contain [a-z, 0-9, -] in their names and $(OSGroup) is "Windows_NT" on Windows... -->
-    <ContainerName Condition="'$(ContainerName)' == '' And '$(IsOfficial)' == 'true'">corefx-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</ContainerName>
-    <HelixBlobPrefix Condition="'$(HelixBlobPrefix)' == '' And '$(IsOfficial)' == 'true' And '$(Branch)' != ''">tests-$(Branch)-$(OSGroup)-$(ArchGroup)-$(TargetGroup)</HelixBlobPrefix>
+    <ContainerName Condition="'$(ContainerName)' == '' And '$(IsOfficial)' == 'true'">corefx-tests</ContainerName>
+    <HelixBlobPrefix Condition="'$(HelixBlobPrefix)' == '' And '$(IsOfficial)' == 'true' And '$(Branch)' != ''">$(Branch)/$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)/$(TargetGroup)/$(OSGroup)-$(ArchGroup)/</HelixBlobPrefix>
     <!-- If this is an official build, set the test drop to be public -->
     <IsDropPublic Condition="'$(IsOffical)' == 'true'">true</IsDropPublic>
   </PropertyGroup>