Skip to content

Commit

Permalink
Fix CG2 outerloop comparison runs and OSX leg warning (#43547)
Browse files Browse the repository at this point in the history
The outerloop run has OSX checked test runs for CG2 and CG2 composite modes. Currently both would use a log upload artifact with the same name (coreclr__TestRunLogs_R2R_CG2_OSX_x64_checked_outerloop). Disambiguate the two with a different `LogNamePrefix` for composite runs.

The crossgen2 comparison runs are failing to create the baseline crossgen'd framework because the live libraries zip's internal path has changed. .net5 has been replaced with .net6. The build should have failed when we tried to copy from the wrong folder but the error got eaten and we ended up with a malformed framework folder. Adjust the inline yml scripts so if they fail, it will fail that containing build task.
  • Loading branch information
nattress authored Oct 19, 2020
1 parent f8fb84c commit 116aae9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions eng/pipelines/common/templates/runtimes/run-test-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ jobs:
- ${{ if eq(parameters.compositeBuildMode, true) }}:
- name: crossgenArg
value: 'composite'
- name: LogNamePrefix
value: TestRunLogs_R2R_CG2_Composite

# Set job timeouts
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
- name: crossgen2location
value: $(productDirectory)$(dir)$(targetFlavor)$(dir)x64$(dir)crossgen2$(dir)crossgen2.dll
- name: librariesProductDllDir
value: $(Build.SourcesDirectory)$(dir)artifacts$(dir)bin$(dir)runtime$(dir)net5.0-$(osGroup)$(osSubgroup)-$(buildConfig)-$(archType)
value: $(Build.SourcesDirectory)$(dir)artifacts$(dir)bin$(dir)runtime$(dir)net6.0-$(osGroup)$(osSubgroup)-$(buildConfig)-$(archType)

- ${{ parameters.variables }}

Expand Down Expand Up @@ -126,6 +126,7 @@ jobs:
cp $(librariesProductDllDir)/* $(workItemDirectory)/dlls
cp $(productDirectory)/$(targetFlavor)/IL/System.Private.CoreLib.dll $(workItemDirectory)/dlls
displayName: Create directories
failOnStderr: true
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: |
md $(workItemDirectory)\log
Expand All @@ -135,6 +136,7 @@ jobs:
echo copy $(productDirectory)\$(targetFlavor)\IL\System.Private.CoreLib.dll $(workItemDirectory)\dlls
copy $(productDirectory)\$(targetFlavor)\IL\System.Private.CoreLib.dll $(workItemDirectory)\dlls
displayName: Create directories
failOnStderr: true
# Create baseline output on the host (x64) machine
- task: PythonScript@0
Expand Down

0 comments on commit 116aae9

Please sign in to comment.