Revert "Revert "Speed up test native binary syncing in pipeline""

diff --git a/config.json b/config.json
index 8e5c06ee001b1867c6e5a40a8309818a7dfb8e1d..d519b00dad479ac33c3dfb7b1cba0a1019a2dac5 100644 (file)
--- a/config.json
+++ b/config.json
@@ -441,6 +441,13 @@
             "Project": "./src/syncAzure.proj"
           }
         },
+        "n": {
+          "description": "Downloads test native binaries. The values for '-AzureAccount', '-AzureToken', and '-Container' are required",
+          "settings": {
+            "Project": "./src/syncAzure.proj",
+            "PublishTestNativeBins": "true"
+          }
+        },
         "azureToken": {
           "description": "Account token to connect to Azure Blob storage.",
           "settings": {
@@ -476,12 +483,6 @@
           "settings": {
             "BuildNumberMinor": "default"
           }
-        },
-        "PublishTestNativeBins": {
-          "description": "Downloads Published test native binaries.",
-          "settings": {
-            "PublishTestNativeBins": "default"
-          }
         }
       },
       "defaultValues": {
@@ -608,4 +609,4 @@
       "valueTypes": {}
     }
   }
-}
+}
\ No newline at end of file

diff --git a/src/publish.proj b/src/publish.proj
index d4e4a7f24ba99bc4e8eaf1dbdc9ad16a911036f5..b1ef3bbaeb48935c1df113e44e2257cdedd41a80 100644 (file)
--- a/src/publish.proj
+++ b/src/publish.proj
@@ -14,7 +14,7 @@
     <ItemGroup>
       <ForPublishing>
         <RelativeBlobPath Condition="'$(PublishTestNativeBins)' != 'true'">$(__BuildType)/%(RecursiveDir)%(Filename)%(Extension)</RelativeBlobPath>
-        <RelativeBlobPath Condition="'$(PublishTestNativeBins)' == 'true'">$(__DistroRid)-$(__BuildArch)/$(__BuildType)/%(RecursiveDir)%(Filename)%(Extension)</RelativeBlobPath>    
+        <RelativeBlobPath Condition="'$(PublishTestNativeBins)' == 'true'">$(__BuildType)/%(RecursiveDir)%(Filename)%(Extension)</RelativeBlobPath>    
       </ForPublishing>
     </ItemGroup>
     <Error Condition="'@(ForPublishing)' == ''" Text="No items were found matching pattern '$(PublishPattern)'." />
@@ -30,9 +30,9 @@
           Condition="'$(ContainerName)' == '' or '$(PublishTestNativeBins)' == 'true'">
     <PropertyGroup>
       <ContainerName Condition="'$(__Container)' == '' and '$(PublishTestNativeBins)' != 'true'">coreclr-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</ContainerName>
-      <ContainerName Condition="'$(__Container)' == '' and '$(PublishTestNativeBins)' == 'true'">coreclr-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)-test-native-bins</ContainerName>
+      <ContainerName Condition="'$(__Container)' == '' and '$(PublishTestNativeBins)' == 'true'">coreclr-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)-$(__DistroRid)-$(__BuildArch)</ContainerName>
       <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' != 'true'">$(__Container)</ContainerName>
-      <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' == 'true'">$(__Container)-test-native-bins</ContainerName>
+      <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' == 'true'">$(__Container)-$(__DistroRid)-$(__BuildArch)</ContainerName>
     </PropertyGroup>
   </Target>
 

diff --git a/src/syncAzure.proj b/src/syncAzure.proj
index 0b71a3bdcdb112581fd463f7eb25f4458eecc36a..de468b7bf7ab9622614962476c612cd610803e4e 100644 (file)
--- a/src/syncAzure.proj
+++ b/src/syncAzure.proj
@@ -5,8 +5,7 @@
   <PropertyGroup>
     <ContainerNamePrefix Condition="'$(ContainerNamePrefix)' == ''">coreclr-$(PreReleaseLabel)</ContainerNamePrefix>
     <ContainerName Condition="'$(__Container)' == '' and '$(ContainerNamePrefix)' != '' and '$(BuildNumberMajor)' != '' and '$(BuildNumberMinor)' != ''">$(ContainerNamePrefix)-$(BuildNumberMajor)-$(BuildNumberMinor)</ContainerName>
-    <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' != 'true'">$(__Container)</ContainerName>
-    <ContainerName Condition="'$(__Container)' != '' and '$(PublishTestNativeBins)' == 'true'">$(__Container)-test-native-bins</ContainerName>
+    <ContainerName Condition="'$(__Container)' != ''">$(__Container)</ContainerName>
     <DownloadDirectory Condition="'$(PublishTestNativeBins)' != 'true'">$(PackagesDir)AzureTransfer</DownloadDirectory>
     <DownloadDirectory Condition="'$(PublishTestNativeBins)' == 'true'">$(PackagesDir)TestNativeBins</DownloadDirectory>
   </PropertyGroup>
@@ -16,6 +15,7 @@
   <Target Name="ValidateRequiredProperties">
     <Error Condition="'$(CloudDropAccountName)' == ''" Text="Missing property CloudDropAccountName." />
     <Error Condition="'$(CloudDropAccessToken)' == ''" Text="Missing property CloudDropAccessToken." />
+    <Error Condition="'$(__Container)' == '' and '$(PublishTestNativeBins)' == 'true'" Text="Missing property Container." />
   </Target>
 
   <Target Name="Build" DependsOnTargets="ValidateRequiredProperties;DownloadBlobsFromAzureTargets" />

diff --git a/sync.cmd b/sync.cmd
index 094d0c1a71d730db385efeecc5d487d3fddee1be..dd089b229d16c499a4d88bf7ea2f470c24e3676a 100644 (file)
--- a/sync.cmd
+++ b/sync.cmd
@@ -7,7 +7,6 @@ if /I [%1] == [-help] goto Usage
 @if [%1]==[] set __args=-p
 
  @call %~dp0run.cmd sync %__args% %*
- @call %~dp0run.cmd sync -PublishTestNativeBins %__args% %*
 @exit /b %ERRORLEVEL%
 
 :Usage
@@ -27,6 +26,12 @@ echo                 -BuildMajor
 echo                 -BuildMinor
 echo              To download from a specific container, specify:
 echo                 -Container="container name"
+echo     -n     - Downloads test native binaries for the specified OS
+echo              The following properties are required:
+echo                 -AzureAccount="Account name"
+echo                 -AzureToken="Access token"
+echo                 -Container="container name (with RID suffix)"
+echo.
 echo.
 echo.
 echo If no option is specified then sync.cmd -p is implied.
\ No newline at end of file