Try to reconcile perf test artifact names

dotnet · May 13, 2020 · 2fba625 · 2fba625
1 parent 09946d4
commit 2fba625
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml
@@ -80,8 +80,12 @@ jobs:
         parameters:
           unpackFolder: $(librariesDownloadDir)/bin/mono/$(osGroup).$(archType).$(buildConfigUpper)
           cleanUnpackFolder: false
-          artifactFileName: 'MonoProduct_$(osGroup)_$(archType)_$(buildConfig)$(archiveExtension)'
-          artifactName: 'MonoProduct_$(osGroup)_$(archType)_$(buildConfig)'
+          ${{ if eq(parameters.runtimeVariant, 'interpreter') }}:
+            artifactFileName: 'MonoProduct__$(osGroup)_$(archType)_$(buildConfig)$(archiveExtension)'
+            artifactName: 'MonoProduct__$(osGroup)_$(archType)_$(buildConfig)'
+          ${{ if ne(parameters.runtimeVariant, 'interpreter') }}:
+            artifactFileName: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)_$(archType)_$(buildConfig)$(archiveExtension)'
+            artifactName: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)_$(archType)_$(buildConfig)'
           displayName: 'Mono runtime'
 
     # Create Core_Root

diff --git a/eng/pipelines/mono/templates/xplat-pipeline-job.yml b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
@@ -54,7 +54,10 @@ jobs:
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(liveRuntimeBuildConfigUpper)'
 
     - name: buildProductArtifactName
-      value: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+      ${{ if eq(parameters.runtimeVariant, 'interpreter') }}:
+        value: 'MonoProduct__$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+      ${{ if ne(parameters.runtimeVariant, 'interpreter') }}:
+        value: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
 
     - name: binTestsPath
       value: '$(Build.SourcesDirectory)/artifacts/tests/coreclr'