Addressing PR Feedback

dotnet · May 27, 2020 · 8682eb4 · 8682eb4
1 parent e6f51b5
commit 8682eb4
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 64 deletions.
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
@@ -25,23 +25,6 @@ jobs:
       clean: all
 
     variables:
-    - name: osGroup
-      value: ${{ parameters.osGroup }}
-    - name: osSubgroup
-      value: ${{ parameters.osSubgroup }}
-    - name: archType
-      value: ${{ parameters.archType }}
-    - name: buildConfig
-      value: ${{ parameters.buildConfig }}
-    - ${{ if eq(parameters.buildConfig, 'debug') }}:
-      - name: buildConfigUpper
-        value: 'Debug'
-    - ${{ if eq(parameters.buildConfig, 'release') }}:
-      - name: buildConfigUpper
-        value: 'Release'
-    - ${{ if eq(parameters.buildConfig, 'checked') }}:
-      - name: buildConfigUpper
-        value: 'Checked'
     - ${{ parameters.variables }}
 
     steps:
@@ -79,4 +62,8 @@ jobs:
     - ${{ if ne(parameters.extraStepsTemplate, '') }}:
       - template: ${{ parameters.extraStepsTemplate }}
         parameters:
+          osGroup: ${{ parameters.osGroup }}
+          osSubgroup: ${{ parameters.osSubgroup }}
+          archType: ${{ parameters.archType }}
+          buildConfig: ${{ parameters.buildConfig }}
           ${{ insert }}: ${{ parameters.extraStepsParameters }}
diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml
@@ -74,6 +74,14 @@ jobs:
         ${{ if eq(parameters.jobParameters.runtimeFlavor, 'coreclr') }}:
           value: CoreCLR
 
+      - name: buildConfigUpper
+        ${{ if eq(parameters.jobParameters.buildConfig, 'debug') }}:
+          value: 'Debug'
+        ${{ if eq(parameters.jobParameters.buildConfig, 'release') }}:
+          value: 'Release'
+        ${{ if eq(parameters.jobParameters.buildConfig, 'checked') }}:
+          value: 'Checked'
+
     osGroup: ${{ parameters.osGroup }}
     osSubgroup: ${{ parameters.osSubgroup }}
     archType: ${{ parameters.archType }}

diff --git a/eng/pipelines/coreclr/templates/xplat-job.yml b/eng/pipelines/coreclr/templates/xplat-job.yml
@@ -72,18 +72,6 @@ jobs:
     - name: buildConfig
       value: ${{ parameters.buildConfig }}
 
-    - ${{ if eq(parameters.buildConfig, 'checked') }}:
-      - name: buildConfigUpper
-        value: 'Checked'
-
-    - ${{ if eq(parameters.buildConfig, 'debug') }}:
-      - name: buildConfigUpper
-        value: 'Debug'
-
-    - ${{ if eq(parameters.buildConfig, 'release') }}:
-      - name: buildConfigUpper
-        value: 'Release'
-
     - name: _BuildConfig
       value: $(buildConfigUpper)
 

diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml
@@ -100,29 +100,7 @@ jobs:
 
         - ${{ if and(eq(parameters.runTests, false), ne(parameters.isSourceBuild, true)) }}:
           - ${{ if ne(parameters.isOfficialBuild, true) }}:            
-            - task: CopyFiles@2
-              displayName: Prepare testhost folder to publish
-              inputs:
-                sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/testhost
-                targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/testhost
-
-            - task: CopyFiles@2
-              displayName: Prepare artifacts toolset folder to publish
-              inputs:
-                sourceFolder: $(Build.SourcesDirectory)/artifacts/toolset
-                targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/toolset
-
-            - task: CopyFiles@2
-              displayName: Prepare runtime folder to publish
-              inputs:
-                sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/runtime
-                targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/runtime
-
-            - task: CopyFiles@2
-              displayName: Prepare ref folder to publish
-              inputs:
-                sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/ref
-                targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/ref
+            - template: /eng/pipelines/libraries/prepare-publish-for-tests.yml
 
           - task: CopyFiles@2
             displayName: Prepare shared framework ref assemblies to publish

diff --git a/eng/pipelines/libraries/prepare-publish-for-tests.yml b/eng/pipelines/libraries/prepare-publish-for-tests.yml
@@ -0,0 +1,26 @@
+# Steps used to prepare the Artifacts Staging Directory with required files for
+# executing libraries tests
+steps:
+  - task: CopyFiles@2
+    displayName: Prepare testhost folder to publish
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/testhost
+      targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/testhost
+
+  - task: CopyFiles@2
+    displayName: Prepare artifacts toolset folder to publish
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/artifacts/toolset
+      targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/toolset
+
+  - task: CopyFiles@2
+    displayName: Prepare runtime folder to publish
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/runtime
+      targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/runtime
+
+  - task: CopyFiles@2
+    displayName: Prepare ref folder to publish
+    inputs:
+      sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/ref
+      targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/ref
diff --git a/eng/pipelines/mono/templates/xplat-job.yml b/eng/pipelines/mono/templates/xplat-job.yml
@@ -70,14 +70,6 @@ jobs:
     - name: buildConfig
       value: ${{ parameters.buildConfig }}
 
-    - ${{ if eq(parameters.buildConfig, 'debug') }}:
-      - name: buildConfigUpper
-        value: 'Debug'
-
-    - ${{ if eq(parameters.buildConfig, 'release') }}:
-      - name: buildConfigUpper
-        value: 'Release'
-
     - name: _BuildConfig
       value: $(buildConfigUpper)
 

diff --git a/eng/pipelines/runtimelab.yml b/eng/pipelines/runtimelab.yml
@@ -81,5 +81,5 @@ jobs:
     jobParameters:
       testGroup: innerloop
       nameSuffix: Runtime_Release
-      buildArgs: -s clr+libs+installer -c release -runtimeConfiguration release
+      buildArgs: -s clr+libs+installer -c release
       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
@@ -1,13 +1,22 @@
+parameters:
+  buildConfig: ''
+  archType: ''
+  osGroup: ''
+  osSubgroup: ''
+
 steps:
+  # Copy all build output into artifacts staging directory
+  - template: /eng/pipelines/libraries/prepare-publish-for-tests.yml
+
   # Zip CoreCLR Build Output
   - template: /eng/pipelines/common/upload-artifact-step.yml
     parameters:
-      rootFolder: $(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)
+      rootFolder: $(Build.SourcesDirectory)/artifacts/bin/coreclr/${{ parameters.osGroup }}.${{ parameters.archType }}.$(buildConfigUpper)
       archiveType: $(archiveType)
       tarCompression: $(tarCompression)
       includeRootFolder: false
       archiveExtension: $(archiveExtension)
-      artifactName: CoreCLRProduct__$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)
+      artifactName: CoreCLRProduct__${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}
       displayName: 'CoreCLR product build'
 
   # Zip Libraries Build Output
@@ -18,5 +27,5 @@ steps:
       tarCompression: $(tarCompression)
       includeRootFolder: false
       archiveExtension: $(archiveExtension)
-      artifactName: libraries_bin_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)
+      artifactName: libraries_bin_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}
       displayName: Build Assets