Publish all packages generated from the experiment branch when in run…

…timelab (#156) (#43193) * Publish all packages generated from the experiment branch * Change publishing to follow installer publish infrastructure * React to name suffix change in all configurations
dotnet · Oct 9, 2020 · bae8b42 · bae8b42
1 parent 7e255ab
commit bae8b42
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
@@ -11,6 +11,7 @@ parameters:
   targetRid: ''
   timeoutInMinutes: ''
   pool: ''
+  platform: ''
   condition: true
   isOfficialBuild: false
   runtimeFlavor: 'coreclr'
@@ -95,6 +96,7 @@ jobs:
           helixQueues: ${{ parameters.helixQueues }}
           targetRid: ${{ parameters.targetRid }}
           nameSuffix: ${{ parameters.nameSuffix }}
+          platform: ${{ parameters.platform }}
           ${{ insert }}: ${{ parameters.extraStepsParameters }}
 
     - task: PublishBuildArtifacts@1

diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml
@@ -365,7 +365,7 @@ jobs:
             parameters.liveRuntimeBuildConfig,
             parameters.globalBuildSuffix) }}
     - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}:
-      - build_Windows_NT_x64_${{ parameters.liveLibrariesBuildConfig }}_All_Configurations
+      - build_Windows_NT_x64_${{ parameters.liveLibrariesBuildConfig }}_AllConfigurations
 
   steps:
 

diff --git a/eng/pipelines/runtimelab.yml b/eng/pipelines/runtimelab.yml
@@ -110,7 +110,7 @@ stages:
       jobParameters:
         isOfficialBuild: ${{ variables.isOfficialBuild }}
         testGroup: innerloop
-        nameSuffix: All_Configurations
+        nameSuffix: AllConfigurations
         buildArgs: -s libs -c $(_BuildConfig) -allConfigurations
         ${{ if eq(variables.isOfficialBuild, true) }}:
           extraStepsTemplate: /eng/pipelines/runtimelab/runtimelab-post-build-steps.yml

diff --git a/eng/pipelines/runtimelab/runtimelab-post-build-steps.yml b/eng/pipelines/runtimelab/runtimelab-post-build-steps.yml
@@ -4,6 +4,7 @@ parameters:
   osGroup: ''
   osSubgroup: ''
   nameSuffix: ''
+  platform: ''
   librariesBinArtifactName: ''
   isOfficialBuild: false
   uploadLibrariesTests: false
@@ -71,4 +72,4 @@ steps:
   - ${{ if eq(parameters.uploadUnsignedArtifacts, true) }}:
     - template: /eng/pipelines/common/upload-unsigned-artifacts-step.yml
       parameters:
-        name: packages_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}${{ parameters.nameSuffix }}
+        name: ${{ parameters.platform }}${{ parameters.nameSuffix }}
diff --git a/src/installer/publish/Directory.Build.targets b/src/installer/publish/Directory.Build.targets
@@ -65,7 +65,7 @@
       <RidAgnosticNupkgToPublishFile
         Include="
           $(DownloadDirectory)*\$(PublishRidAgnosticPackagesFromPlatform)\**\*.nupkg;
-          $(DownloadDirectory)*\Libraries_AllConfigurations\**\*.nupkg"
+          $(DownloadDirectory)*\*AllConfigurations\**\*.nupkg"
         Exclude="@(RuntimeNupkgFile);@(DownloadedSymbolNupkgFile)" />
 
       <TransportPackagesToPublishFile