From 822a7beb4752422d25ed3f011fc441df6a285d81 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 11 Mar 2020 14:51:56 -0400 Subject: [PATCH 01/49] parent 87e1674da8daaa0f13e374385035039d3ef9cdde author Joseph Shields 1583952716 -0400 committer Nathan Ricci 1586815263 -0400 Add Mono run of CoreCLR Pri0 tests Changes to exclude mono failures. build-test-job.yml Changes to runtime.yml Changes to runtime.yml Got rid of parameter. Removed parameter. reverse changesin runtime. Simplified some things. Combined mono/clore build-test-job.yml into one file in common. Removed onld build-test-job.yml Removed white space. Missing parens. Removed undeed mono build-test-job. Removed run-test-job.yml Added build-job back; still needed. Added back a change that got lost in merge. Got rid of compile time evaluation of runtime stuff. Moved xplat-pipeline-job to common. Updated paths. More path updates. Moved xplat-job. Undid file moves. Refer to different templates based on runtime parameters. reverted changes to build-job. Updated build-test-job. Moved to a mono version of run-test-job. Back to seperate versions of run-test-job.yml Added back mono version of run-test-job.yml Moved references to common version of build-test. Build test job.yml Moved send-to-helix-step to common. Removed mono specific send-to-helix-step. Moved run-test-job.yml into common. Fixed run-test-job. Fixed run test job again. Fixed run test job again. Fixed run test job again. Removed mono specific version of run-test-job. Removed windows from mono coreclr test platforms until that script is written. Added some variables to mono version of xplat-job. Made building tests depend explicitly on coreclr. Made mono also get CoreCLR. Fixed spacing. Fixed syntax error. build-test-job.yml Changed dispaly name. Changed dispaly name. Fixed variable name. Fixed white space. Testing some yml. Reversed changes. Removed - Used each. Add liveRuntimeBuildConfig parameter. Add liveRuntimeBuildConfig parameter. removed redundant definition. removed redundant definition. removed redundant paramter. Fixed typos, display names. Added display name. Use display name. Added missing : Fixed spelling errors. Fixed spelling error. Fixed spelling error. Canged CoreCLRProductBuild to always use release Use display name. Commented out other architecturs for debugging. Added runtimeFlavorDisplayName explicitly in runtime.yml Added missing variables to mono version of xplat-pipeline job Put in missing variables. More missing variables. More missing variables. Changed hardcoded release. Added liveRuntimeBuildConfig. Changed to parameter. Changed to parameter. Trying to make everything build in release. Messing with different configs. Made everything checked. Added runtime flavor to run-test-job name. Fixed spelling on parameters. Made all the mono stuff build in debug. Made more things debug. Changed everything to release. Made everthing release, again. Changed to run test job. Added missing space. run-test-job.yml Fixed msbuild invocation. Pushing a white space change. Removed white space change. Removed unneeded single quotes. --- .../templates/build-test-job.yml | 34 ++++++++--- .../templates/run-test-job.yml | 28 ++++++--- .../templates/send-to-helix-step.yml | 0 eng/pipelines/common/xplat-setup.yml | 4 ++ eng/pipelines/coreclr/ci.yml | 4 +- eng/pipelines/coreclr/corefx-jitstress.yml | 2 +- .../corefx-jitstress2-jitstressregs.yml | 2 +- .../coreclr/corefx-jitstressregs.yml | 2 +- eng/pipelines/coreclr/corefx.yml | 2 +- eng/pipelines/coreclr/crossgen2-outerloop.yml | 2 +- eng/pipelines/coreclr/crossgen2.yml | 2 +- eng/pipelines/coreclr/gc-longrunning.yml | 2 +- eng/pipelines/coreclr/jitstress-isas-x86.yml | 2 +- eng/pipelines/coreclr/release-tests.yml | 4 +- eng/pipelines/coreclr/templates/test-job.yml | 2 +- eng/pipelines/mono/templates/build-job.yml | 6 +- eng/pipelines/mono/templates/xplat-job.yml | 10 ++++ .../mono/templates/xplat-pipeline-job.yml | 35 +++++++++++ eng/pipelines/runtime.yml | 58 +++++++++++++++++-- 19 files changed, 164 insertions(+), 37 deletions(-) rename eng/pipelines/{coreclr => common}/templates/build-test-job.yml (74%) rename eng/pipelines/{coreclr => common}/templates/run-test-job.yml (89%) rename eng/pipelines/{coreclr => common}/templates/send-to-helix-step.yml (100%) diff --git a/eng/pipelines/coreclr/templates/build-test-job.yml b/eng/pipelines/common/templates/build-test-job.yml similarity index 74% rename from eng/pipelines/coreclr/templates/build-test-job.yml rename to eng/pipelines/common/templates/build-test-job.yml index 75650136520d5..af5373f530ffc 100644 --- a/eng/pipelines/coreclr/templates/build-test-job.yml +++ b/eng/pipelines/common/templates/build-test-job.yml @@ -5,6 +5,7 @@ parameters: osSubgroup: '' container: '' testGroup: '' + liveRuntimeBuildConfig: '' # When set to a non-empty value (Debug / Release), it determines libraries # build configuration to use for the tests. Setting this property implies @@ -18,6 +19,7 @@ parameters: stagedBuild: false variables: {} pool: '' + runtimeFlavorDisplayName: 'CoreCLR' ### Build managed test components (native components are getting built as part ### of the the product build job). @@ -27,8 +29,9 @@ parameters: ### over to its reference assembly we should be able to remove this dependency and ### run managed test builds in parallel with the product build job. + jobs: -- template: xplat-pipeline-job.yml +- template: /eng/pipelines/${{ parameters.runtimeFlavor }}/templates/xplat-pipeline-job.yml parameters: buildConfig: ${{ parameters.buildConfig }} archType: ${{ parameters.archType }} @@ -40,21 +43,25 @@ jobs: testGroup: ${{ parameters.testGroup }} stagedBuild: ${{ parameters.stagedBuild }} liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }} - variables: ${{ parameters.variables }} + variables: + - runtimeFlavorArgs: '' + - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: + - runtimeFlavorArgs: '-excludemonofailures' + - ${{ each variable in parameters.variables }}: + - ${{insert}}: ${{ variable }} pool: ${{ parameters.pool }} # Test jobs should continue on error for internal builds ${{ if eq(variables['System.TeamProject'], 'internal') }}: continueOnError: true - # Compute job name from template parameters ${{ if eq(parameters.testGroup, 'innerloop') }}: - name: 'coreclr_test_build_p0_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' - displayName: 'CoreCLR Pri0 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' + name: '${{ parameters.runtimeFlavor }}_test_build_p0_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' + displayName: '${{ parameters.runtimeFlavorDisplayName }} Pri0 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' ${{ if ne(parameters.testGroup, 'innerloop') }}: - name: 'coreclr_test_build_p1_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' - displayName: 'CoreCLR Pri1 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' + name: '${{ parameters.runtimeFlavor }}_test_build_p1_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' + displayName: '${{ parameters.runtimeFlavorDisplayName }} Pri1 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' # Since the condition is being altered, merge the default with the additional conditions. # See https://docs.microsoft.com/azure/devops/pipelines/process/conditions @@ -65,7 +72,7 @@ jobs: # by switching over to using reference assembly. ${{ if ne(parameters.stagedBuild, true) }}: dependsOn: - - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} + - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }} @@ -98,6 +105,15 @@ jobs: artifactName: '$(librariesBuildArtifactName)' displayName: 'live-built libraries' + - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: + # We need to explictly download CoreCLR for Mono + - template: /eng/pipelines/common/download-artifact-step.yml + parameters: + unpackFolder: $(coreClrProductRootFolderPath) + artifactFileName: '$(coreClrProductArtifactName)$(archiveExtension)' + artifactName: '$(coreClrProductArtifactName)' + displayName: 'CoreCLR product build for Mono' + # Download product binaries directory - template: /eng/pipelines/common/download-artifact-step.yml @@ -109,7 +125,7 @@ jobs: # Build managed test components - - script: $(coreClrRepoRootDir)build-test$(scriptExt) skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(crossArg) $(priorityArg) ci $(librariesOverrideArg) + - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(runtimeFlavorArgs) skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(crossArg) $(priorityArg) ci $(librariesOverrideArg) displayName: Build managed test components diff --git a/eng/pipelines/coreclr/templates/run-test-job.yml b/eng/pipelines/common/templates/run-test-job.yml similarity index 89% rename from eng/pipelines/coreclr/templates/run-test-job.yml rename to eng/pipelines/common/templates/run-test-job.yml index 4bdb1d38891bf..54db9447708dc 100644 --- a/eng/pipelines/coreclr/templates/run-test-job.yml +++ b/eng/pipelines/common/templates/run-test-job.yml @@ -20,6 +20,7 @@ parameters: runInUnloadableContext: false variables: {} pool: '' + runtimeFlavorDisplayName: 'CoreCLR' ### Test run job @@ -27,7 +28,7 @@ parameters: ### buildConfig and archType. jobs: -- template: xplat-pipeline-job.yml +- template: /eng/pipelines/${{ parameters.runtimeFlavor }}/templates/xplat-pipeline-job.yml parameters: buildConfig: ${{ parameters.buildConfig }} archType: ${{ parameters.archType }} @@ -52,22 +53,22 @@ jobs: dependsOn: - ${{ if ne(parameters.corefxTests, true) }}: - ${{ if eq(parameters.testGroup, 'innerloop') }}: - - 'coreclr_test_build_p0_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' + - '${{ parameters.runtimeFlavor }}_test_build_p0_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' - ${{ if ne(parameters.testGroup, 'innerloop') }}: - - 'coreclr_test_build_p1_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' + - '${{ parameters.runtimeFlavor }}_test_build_p1_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' - ${{ if ne(parameters.stagedBuild, true) }}: - - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} + - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }} # Compute job name from template parameters ${{ if eq(parameters.testGroup, 'innerloop') }}: - name: 'run_test_p0_${{ parameters.displayNameArgs }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' - displayName: 'CoreCLR Pri0 Test Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' + name: 'run_test_p0_${{ parameters.runtimeFlavor }}_${{ parameters.displayNameArgs }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' + displayName: '${{ parameters.runtimeFlavorDisplayName }} Pri0 Test Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' ${{ if ne(parameters.testGroup, 'innerloop') }}: name: 'run_test_p1_${{ parameters.displayNameArgs }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' - displayName: 'CoreCLR Pri1 Test Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' + displayName: '${{ parameters.runtimeFlavorDisplayName }} Pri1 Test Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' variables: - name: testhostArg @@ -190,6 +191,17 @@ jobs: displayName: 'product build' + - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: + # We need to explictly download CoreCLR for Mono + - template: /eng/pipelines/common/download-artifact-step.yml + parameters: + unpackFolder: $(coreClrProductRootFolderPath) + artifactFileName: '$(coreClrProductArtifactName)$(archiveExtension)' + artifactName: '$(coreClrProductArtifactName)' + displayName: 'CoreCLR product download for Mono' + + - script: msbuild $(monoRepoRoot)/mono.proj -target:PatchCoreClrCoreRoot + # Download and unzip the Microsoft.NET.Sdk.IL package needed for traversing # ilproj test projects during copynativeonly. - ${{ if ne(parameters.corefxTests, true) }}: @@ -239,7 +251,7 @@ jobs: # Send tests to Helix - - template: /eng/pipelines/coreclr/templates/send-to-helix-step.yml + - template: /eng/pipelines/common/templates/send-to-helix-step.yml parameters: displayName: Send tests to Helix buildConfig: $(buildConfigUpper) diff --git a/eng/pipelines/coreclr/templates/send-to-helix-step.yml b/eng/pipelines/common/templates/send-to-helix-step.yml similarity index 100% rename from eng/pipelines/coreclr/templates/send-to-helix-step.yml rename to eng/pipelines/common/templates/send-to-helix-step.yml diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 65777987497a0..3685372654beb 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -11,6 +11,10 @@ parameters: jobs: - template: ${{ coalesce(parameters.helixQueuesTemplate, parameters.jobTemplate) }} parameters: + ${{ if eq(parameters.runtimeFlavor, 'coreclr') }}: + runtimeFlavorDisplayName: 'CoreCLR' + ${{ if eq(parameters.runtimeFlavor, 'mono') }}: + runtimeFlavorDisplayName: 'Mono' variables: # Workaround for azure devops flakiness when dowloading artifacts # https://github.com/dotnet/runtime/issues/32805 diff --git a/eng/pipelines/coreclr/ci.yml b/eng/pipelines/coreclr/ci.yml index 0249dc33eba23..ce1fe419bb386 100644 --- a/eng/pipelines/coreclr/ci.yml +++ b/eng/pipelines/coreclr/ci.yml @@ -113,7 +113,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml buildConfig: checked platformGroup: all helixQueueGroup: ci @@ -127,7 +127,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml buildConfig: checked platforms: - Linux_arm64 diff --git a/eng/pipelines/coreclr/corefx-jitstress.yml b/eng/pipelines/coreclr/corefx-jitstress.yml index 117923beb5eb2..3fed9e0cafd8b 100644 --- a/eng/pipelines/coreclr/corefx-jitstress.yml +++ b/eng/pipelines/coreclr/corefx-jitstress.yml @@ -33,7 +33,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml buildConfig: checked platforms: # TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this. diff --git a/eng/pipelines/coreclr/corefx-jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/corefx-jitstress2-jitstressregs.yml index 9b3064766f131..ad23e5e0be99f 100644 --- a/eng/pipelines/coreclr/corefx-jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/corefx-jitstress2-jitstressregs.yml @@ -33,7 +33,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml buildConfig: checked platforms: # TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this. diff --git a/eng/pipelines/coreclr/corefx-jitstressregs.yml b/eng/pipelines/coreclr/corefx-jitstressregs.yml index 476666287241b..bc61d949b07f0 100644 --- a/eng/pipelines/coreclr/corefx-jitstressregs.yml +++ b/eng/pipelines/coreclr/corefx-jitstressregs.yml @@ -33,7 +33,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml buildConfig: checked platforms: # TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this. diff --git a/eng/pipelines/coreclr/corefx.yml b/eng/pipelines/coreclr/corefx.yml index e2fb3c28d4e15..7f5f13a3ba4f2 100644 --- a/eng/pipelines/coreclr/corefx.yml +++ b/eng/pipelines/coreclr/corefx.yml @@ -33,7 +33,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml buildConfig: checked platforms: # TODO: add Windows_NT_arm64, when we have hardware available, and .NET Core supports it. Note: platform-matrix.yml needs to enable a Helix queue for this. diff --git a/eng/pipelines/coreclr/crossgen2-outerloop.yml b/eng/pipelines/coreclr/crossgen2-outerloop.yml index d31a45088687b..4a98724962700 100644 --- a/eng/pipelines/coreclr/crossgen2-outerloop.yml +++ b/eng/pipelines/coreclr/crossgen2-outerloop.yml @@ -40,7 +40,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml buildConfig: checked platforms: diff --git a/eng/pipelines/coreclr/crossgen2.yml b/eng/pipelines/coreclr/crossgen2.yml index 3d1ea01d4f69d..0a9b3cf75a9fd 100644 --- a/eng/pipelines/coreclr/crossgen2.yml +++ b/eng/pipelines/coreclr/crossgen2.yml @@ -40,7 +40,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml buildConfig: checked platforms: diff --git a/eng/pipelines/coreclr/gc-longrunning.yml b/eng/pipelines/coreclr/gc-longrunning.yml index 5d3ec8f9e5335..5195927687fe2 100644 --- a/eng/pipelines/coreclr/gc-longrunning.yml +++ b/eng/pipelines/coreclr/gc-longrunning.yml @@ -43,7 +43,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml buildConfig: release platforms: - Linux_x64 diff --git a/eng/pipelines/coreclr/jitstress-isas-x86.yml b/eng/pipelines/coreclr/jitstress-isas-x86.yml index 52d977d4b7ea4..be611a80264cc 100644 --- a/eng/pipelines/coreclr/jitstress-isas-x86.yml +++ b/eng/pipelines/coreclr/jitstress-isas-x86.yml @@ -42,7 +42,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml buildConfig: checked platforms: - Linux_x64 diff --git a/eng/pipelines/coreclr/release-tests.yml b/eng/pipelines/coreclr/release-tests.yml index 29342df4f6153..3a549dad7a0f7 100644 --- a/eng/pipelines/coreclr/release-tests.yml +++ b/eng/pipelines/coreclr/release-tests.yml @@ -44,7 +44,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml buildConfig: release platformGroup: all helixQueueGroup: ci @@ -58,7 +58,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml buildConfig: release platformGroup: all helixQueueGroup: ci diff --git a/eng/pipelines/coreclr/templates/test-job.yml b/eng/pipelines/coreclr/templates/test-job.yml index e1679923841cb..ab3a4e48335e5 100644 --- a/eng/pipelines/coreclr/templates/test-job.yml +++ b/eng/pipelines/coreclr/templates/test-job.yml @@ -42,7 +42,7 @@ jobs: variables: ${{ parameters.variables }} pool: ${{ parameters.pool }} -- template: /eng/pipelines/coreclr/templates/run-test-job.yml +- template: /eng/pipelines/common/templates/run-test-job.yml parameters: buildConfig: ${{ parameters.buildConfig }} liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }} diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 878f34e937419..e554e749a1c83 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -53,8 +53,10 @@ jobs: value: ${{ parameters.osSubgroup }} - name: officialBuildIdArg value: '' - - name: osOverride - value: '' + # Strip symbols only on the release build + - ${{ if eq(parameters.buildConfig, 'Release') }}: + - name: stripSymbolsArg + value: '-stripsymbols' - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: - name: officialBuildIdArg value: '/p:officialBuildId=$(Build.BuildNumber)' diff --git a/eng/pipelines/mono/templates/xplat-job.yml b/eng/pipelines/mono/templates/xplat-job.yml index 2cd61dc7e7f3e..c6e8864e41137 100644 --- a/eng/pipelines/mono/templates/xplat-job.yml +++ b/eng/pipelines/mono/templates/xplat-job.yml @@ -90,6 +90,16 @@ jobs: - name: osSubgroup value: ${{ parameters.osSubgroup }} + - name: coreClrRepoRoot + value: '$(Build.SourcesDirectory)/src/coreclr' + + - name: coreClrRepoRootDir + value: '$(coreClrRepoRoot)$(dir)' + + - name: priorityArg + value: '' + + - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: - name: _HelixSource value: official/dotnet/runtime/$(Build.SourceBranch) diff --git a/eng/pipelines/mono/templates/xplat-pipeline-job.yml b/eng/pipelines/mono/templates/xplat-pipeline-job.yml index a0d6584520392..052b0f59fcdaa 100644 --- a/eng/pipelines/mono/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/mono/templates/xplat-pipeline-job.yml @@ -10,6 +10,7 @@ parameters: strategy: '' pool: '' llvm: false + liveRuntimeBuildConfig: 'release' # arcade-specific parameters condition: true @@ -46,15 +47,49 @@ jobs: gatherAssetManifests: ${{ parameters.gatherAssetManifests }} variables: + + - name: coreClrProductArtifactName + value: 'CoreCLRProduct_$(osGroup)$(osSubgroup)_$(archType)_${{ parameters.liveRuntimeBuildConfig }}' + + - name: coreClrProductRootFolderPath + value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).${{ parameters.liveRuntimeBuildConfig }}' + - name: buildProductArtifactName ${{ if ne(parameters.llvm, true) }}: value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' ${{ if eq(parameters.llvm, true) }}: value: 'MonoProduct_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' + - name: binTestsPath + value: '$(Build.SourcesDirectory)/artifacts/tests/coreclr' + - name: buildProductRootFolderPath value: '$(Build.SourcesDirectory)/artifacts/bin/mono/$(osGroup).$(archType).$(buildConfigUpper)' + - name: managedTestArtifactRootFolderPath + value: '$(binTestsPath)/$(osGroup).$(archType).$(buildConfigUpper)' + + - name: managedTestArtifactName + value: 'CoreCLRManagedTestArtifacts_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_$(archType)_$(buildConfig)' + + - name: microsoftNetSdkIlFolderPath + value: '$(Build.SourcesDirectory)/.packages/microsoft.net.sdk.il' + + - name: microsoftNetSdkIlArtifactName + value: 'MicrosoftNetSdkIlPackage_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_$(archType)_$(buildConfig)' + + - name: monoRepoRoot + value: '$(Build.SourcesDirectory)/src/mono' + + - name: nativeTestArtifactName + value: 'CoreCLRNativeTestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' + + - name: nativeTestArtifactRootFolderPath + value: '$(binTestsPath)/obj/$(osGroup).$(archType).$(buildConfigUpper)' + + + + - librariesBuildArtifactName: '' - librariesOverrideArg: '' - librariesDownloadDir: '' diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 8f909825a4311..a17e1a1917d1e 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -229,7 +229,7 @@ jobs: parameters: jobTemplate: /eng/pipelines/mono/templates/build-job.yml runtimeFlavor: mono - buildConfig: debug + buildConfig: debug platforms: - iOS_x64 - iOS_arm @@ -529,7 +529,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/build-test-job.yml + jobTemplate: /eng/pipelines/common/templates/build-test-job.yml buildConfig: checked platforms: - Linux_arm @@ -550,7 +550,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/build-test-job.yml + jobTemplate: /eng/pipelines/common/templates/build-test-job.yml buildConfig: checked platforms: - OSX_x64 @@ -571,7 +571,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml buildConfig: checked platforms: - Linux_arm @@ -590,7 +590,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml buildConfig: checked platforms: - OSX_x64 @@ -607,6 +607,54 @@ jobs: eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), eq(variables['isFullMatrix'], true)) +# +# Mono Test builds using live libraries debug build +# Only when Mono is changed +# TODO: Add Windows_NT_x64 to platform ones the script for windows is written +- template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/common/templates/build-test-job.yml + buildConfig: release + runtimeFlavor: mono + platforms: + - OSX_x64 + # - Linux_x64 + # - Linux_arm64 + jobParameters: + testGroup: innerloop + liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} + liveRuntimeBuildConfig: release + runtimeFlavorDisplayName: 'Mono' + condition: >- + or( + eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(variables['isFullMatrix'], true)) + +# +# Mono Test executions using live libraries +# Only when Mono is changed +# TODO: Add Windows_NT_x64 to platform ones the script for windows is written +- template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + buildConfig: release + runtimeFlavor: mono + platforms: + - OSX_x64 + # - Linux_x64 + # - Linux_arm64 + helixQueueGroup: pr + helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + jobParameters: + testGroup: innerloop + liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} + liveRuntimeBuildConfig: release + runtimeFlavorDisplayName: 'Mono' + condition: >- + or( + eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(variables['isFullMatrix'], true)) + # # Libraries Release Test Execution against a release mono runtime. # Only when libraries or mono changed From 907c686905352a57d11f3a514b3da754e546f31a Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 14 Apr 2020 13:00:30 -0400 Subject: [PATCH 02/49] Added parameter to msbuild. --- eng/pipelines/common/templates/run-test-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/run-test-job.yml b/eng/pipelines/common/templates/run-test-job.yml index 54db9447708dc..41f877d5d2e36 100644 --- a/eng/pipelines/common/templates/run-test-job.yml +++ b/eng/pipelines/common/templates/run-test-job.yml @@ -200,7 +200,7 @@ jobs: artifactName: '$(coreClrProductArtifactName)' displayName: 'CoreCLR product download for Mono' - - script: msbuild $(monoRepoRoot)/mono.proj -target:PatchCoreClrCoreRoot + - script: msbuild $(monoRepoRoot)/mono.proj -target:PatchCoreClrCoreRoot /p:Configuration=Release # Download and unzip the Microsoft.NET.Sdk.IL package needed for traversing # ilproj test projects during copynativeonly. From 0acbde49f89c4bdd3d842d0c568a369312c05251 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 14 Apr 2020 16:14:37 -0400 Subject: [PATCH 03/49] Remove direct invocation of msbuild. --- eng/pipelines/common/templates/run-test-job.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/run-test-job.yml b/eng/pipelines/common/templates/run-test-job.yml index 41f877d5d2e36..9c9ae9f8790a6 100644 --- a/eng/pipelines/common/templates/run-test-job.yml +++ b/eng/pipelines/common/templates/run-test-job.yml @@ -200,7 +200,12 @@ jobs: artifactName: '$(coreClrProductArtifactName)' displayName: 'CoreCLR product download for Mono' - - script: msbuild $(monoRepoRoot)/mono.proj -target:PatchCoreClrCoreRoot /p:Configuration=Release + - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) + -ci + -projects $(Build.SourcesDirectory)/src/mono + /t:PatchCoreClrCoreRoot + displaName: "Patch dotnet with mono" + # Download and unzip the Microsoft.NET.Sdk.IL package needed for traversing # ilproj test projects during copynativeonly. From 1500c7be86142fe39106e19ffaf522490e3e2129 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 14 Apr 2020 16:32:37 -0400 Subject: [PATCH 04/49] Fixed white space, spelling issues. --- eng/pipelines/common/templates/run-test-job.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/common/templates/run-test-job.yml b/eng/pipelines/common/templates/run-test-job.yml index 9c9ae9f8790a6..3811c8c81dea1 100644 --- a/eng/pipelines/common/templates/run-test-job.yml +++ b/eng/pipelines/common/templates/run-test-job.yml @@ -191,7 +191,7 @@ jobs: displayName: 'product build' - - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: + - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: # We need to explictly download CoreCLR for Mono - template: /eng/pipelines/common/download-artifact-step.yml parameters: @@ -201,10 +201,10 @@ jobs: displayName: 'CoreCLR product download for Mono' - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) - -ci + -ci -projects $(Build.SourcesDirectory)/src/mono /t:PatchCoreClrCoreRoot - displaName: "Patch dotnet with mono" + displayName: "Patch dotnet with mono" # Download and unzip the Microsoft.NET.Sdk.IL package needed for traversing From dbcd508dd49b8f0e056973f5691753de060dcf12 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 14 Apr 2020 21:24:52 -0400 Subject: [PATCH 05/49] Propaged runtime flavor dispaly name to test run names. --- eng/pipelines/common/templates/send-to-helix-step.yml | 3 +++ src/coreclr/tests/helixpublishwitharcade.proj | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/send-to-helix-step.yml b/eng/pipelines/common/templates/send-to-helix-step.yml index 7209065b570b5..ab0b34550217a 100644 --- a/eng/pipelines/common/templates/send-to-helix-step.yml +++ b/eng/pipelines/common/templates/send-to-helix-step.yml @@ -21,6 +21,7 @@ parameters: longRunningGcTests: '' gcSimulatorTests: '' coreClrRepoRoot: '' + runtimeFlavorDisplayName: 'CoreCLR' steps: - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: @@ -53,6 +54,7 @@ steps: _Scenarios: ${{ join(',', parameters.scenarios) }} _TimeoutPerTestCollectionInMinutes: ${{ parameters.timeoutPerTestCollectionInMinutes }} _TimeoutPerTestInMinutes: ${{ parameters.timeoutPerTestInMinutes }} + runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }} ${{ if eq(parameters.publishTestResults, 'true') }}: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # TODO: remove NUGET_PACKAGES once https://github.com/dotnet/arcade/issues/1578 is fixed @@ -92,6 +94,7 @@ steps: _Scenarios: ${{ join(',', parameters.scenarios) }} _TimeoutPerTestCollectionInMinutes: ${{ parameters.timeoutPerTestCollectionInMinutes }} _TimeoutPerTestInMinutes: ${{ parameters.timeoutPerTestInMinutes }} + runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }} ${{ if eq(parameters.publishTestResults, 'true') }}: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # TODO: remove NUGET_PACKAGES once https://github.com/dotnet/arcade/issues/1578 is fixed diff --git a/src/coreclr/tests/helixpublishwitharcade.proj b/src/coreclr/tests/helixpublishwitharcade.proj index c17019aefb81d..52058ae763302 100644 --- a/src/coreclr/tests/helixpublishwitharcade.proj +++ b/src/coreclr/tests/helixpublishwitharcade.proj @@ -176,8 +176,8 @@ false R2R R2R-CG2 - $(TestRunNamePrefix)$(TargetOS) $(BuildArch) $(BuildType) @ - $(TestRunNamePrefix)$(TargetOS) $(BuildArch) $(BuildType) $(Scenario) @ + $(RuntimeFlavorDisplayName) $(TestRunNamePrefix)$(TargetOS) $(BuildArch) $(BuildType) @ + $(RuntimeFlavorDisplayName) $(TestRunNamePrefix)$(TargetOS) $(BuildArch) $(BuildType) $(Scenario) @ $([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds) true <_XUnitParallelMode>collections From bb7367e6ae6d4c9ba2f672467d2a7b41666f465f Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Wed, 15 Apr 2020 12:31:18 -0400 Subject: [PATCH 06/49] Fixed proj file path. --- eng/pipelines/common/templates/run-test-job.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/run-test-job.yml b/eng/pipelines/common/templates/run-test-job.yml index 3811c8c81dea1..90bf068174da1 100644 --- a/eng/pipelines/common/templates/run-test-job.yml +++ b/eng/pipelines/common/templates/run-test-job.yml @@ -202,7 +202,7 @@ jobs: - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci - -projects $(Build.SourcesDirectory)/src/mono + -projects $(Build.SourcesDirectory)/src/mono/mono.proj /t:PatchCoreClrCoreRoot displayName: "Patch dotnet with mono" @@ -263,6 +263,7 @@ jobs: archType: ${{ parameters.archType }} osGroup: ${{ parameters.osGroup }} coreClrRepoRoot: $(coreClrRepoRoot) + runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }} ${{ if eq(variables['System.TeamProject'], 'public') }}: creator: $(Build.DefinitionName) From eea6d8d9bf6b179145c711bf674f6da0134790ab Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Wed, 15 Apr 2020 12:35:17 -0400 Subject: [PATCH 07/49] Removed extra whitespace. --- eng/pipelines/runtime.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index a17e1a1917d1e..070f6410a8532 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -229,7 +229,7 @@ jobs: parameters: jobTemplate: /eng/pipelines/mono/templates/build-job.yml runtimeFlavor: mono - buildConfig: debug + buildConfig: debug platforms: - iOS_x64 - iOS_arm From ae7cf8b0d1a4e7d56d78925e1e3f5c8b6a631113 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Wed, 15 Apr 2020 12:41:25 -0400 Subject: [PATCH 08/49] Used TestPrefix --- src/coreclr/tests/helixpublishwitharcade.proj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/coreclr/tests/helixpublishwitharcade.proj b/src/coreclr/tests/helixpublishwitharcade.proj index 52058ae763302..acc68b0b3af42 100644 --- a/src/coreclr/tests/helixpublishwitharcade.proj +++ b/src/coreclr/tests/helixpublishwitharcade.proj @@ -174,10 +174,11 @@ false false false + $(RuntimeFlavorDisplayName) R2R R2R-CG2 - $(RuntimeFlavorDisplayName) $(TestRunNamePrefix)$(TargetOS) $(BuildArch) $(BuildType) @ - $(RuntimeFlavorDisplayName) $(TestRunNamePrefix)$(TargetOS) $(BuildArch) $(BuildType) $(Scenario) @ + $(TestRunNamePrefix)$(TargetOS) $(BuildArch) $(BuildType) @ + $(TestRunNamePrefix)$(TargetOS) $(BuildArch) $(BuildType) $(Scenario) @ $([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds) true <_XUnitParallelMode>collections From 888ca66386ea1dd1e75aa70d67cfad023fc88618 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Wed, 15 Apr 2020 12:58:59 -0400 Subject: [PATCH 09/49] Improved comments. --- eng/pipelines/runtime.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 070f6410a8532..a800cad711b09 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -608,7 +608,7 @@ jobs: eq(variables['isFullMatrix'], true)) # -# Mono Test builds using live libraries debug build +# Mono Test builds with CoreCLR runtime tests using live libraries debug build # Only when Mono is changed # TODO: Add Windows_NT_x64 to platform ones the script for windows is written - template: /eng/pipelines/common/platform-matrix.yml @@ -631,7 +631,7 @@ jobs: eq(variables['isFullMatrix'], true)) # -# Mono Test executions using live libraries +# Mono CoreCLR runtime Test executions using live libraries # Only when Mono is changed # TODO: Add Windows_NT_x64 to platform ones the script for windows is written - template: /eng/pipelines/common/platform-matrix.yml From 2f9d2eebe6e549a37c341278c309b8937fc25781 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Wed, 15 Apr 2020 16:44:12 -0400 Subject: [PATCH 10/49] Reversed unneeded changes in build-job.yml --- eng/pipelines/mono/templates/build-job.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index be7b7cf67ce64..551b386055eb1 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -53,10 +53,8 @@ jobs: value: ${{ parameters.osSubgroup }} - name: officialBuildIdArg value: '' - # Strip symbols only on the release build - - ${{ if eq(parameters.buildConfig, 'Release') }}: - - name: stripSymbolsArg - value: '-stripsymbols' + - name: osOverride + value: '' - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: - name: officialBuildIdArg value: '/p:officialBuildId=$(Build.BuildNumber)' From dfd4d30d10265cd21c4786034c0e3ced83a9cafe Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Wed, 15 Apr 2020 18:47:31 -0400 Subject: [PATCH 11/49] Updated comment. --- eng/pipelines/common/templates/build-test-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/build-test-job.yml b/eng/pipelines/common/templates/build-test-job.yml index af5373f530ffc..f360eb1843244 100644 --- a/eng/pipelines/common/templates/build-test-job.yml +++ b/eng/pipelines/common/templates/build-test-job.yml @@ -106,7 +106,7 @@ jobs: displayName: 'live-built libraries' - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - # We need to explictly download CoreCLR for Mono + # We need to explictly download CoreCLR for Mono because the CoreCLR tests depend on it - template: /eng/pipelines/common/download-artifact-step.yml parameters: unpackFolder: $(coreClrProductRootFolderPath) From 023ea9bdb06b3955e937267d6b278f3dac6a6064 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Wed, 15 Apr 2020 19:25:34 -0400 Subject: [PATCH 12/49] Removed tab. --- eng/pipelines/common/templates/run-test-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/run-test-job.yml b/eng/pipelines/common/templates/run-test-job.yml index 6c8d90f939af8..ba7f8582a9aa5 100644 --- a/eng/pipelines/common/templates/run-test-job.yml +++ b/eng/pipelines/common/templates/run-test-job.yml @@ -271,7 +271,7 @@ jobs: archType: ${{ parameters.archType }} osGroup: ${{ parameters.osGroup }} coreClrRepoRoot: $(coreClrRepoRoot) - runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }} + runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }} ${{ if eq(variables['System.TeamProject'], 'public') }}: creator: $(Build.DefinitionName) From ac9dca9ac0cc8f2d3c77a74ae98e73642485caa9 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Thu, 16 Apr 2020 13:09:13 -0400 Subject: [PATCH 13/49] Changed paths common/templates -> common/templates/runtimes --- .../templates/{ => runtimes}/build-test-job.yml | 0 .../common/templates/{ => runtimes}/run-test-job.yml | 0 .../templates/{ => runtimes}/send-to-helix-step.yml | 0 eng/pipelines/coreclr/ci.yml | 6 +++--- eng/pipelines/coreclr/corefx-jitstress.yml | 2 +- .../coreclr/corefx-jitstress2-jitstressregs.yml | 2 +- eng/pipelines/coreclr/corefx-jitstressregs.yml | 2 +- eng/pipelines/coreclr/corefx.yml | 2 +- eng/pipelines/coreclr/crossgen2-outerloop.yml | 2 +- eng/pipelines/coreclr/crossgen2.yml | 4 ++-- eng/pipelines/coreclr/gc-longrunning.yml | 2 +- eng/pipelines/coreclr/jitstress-isas-x86.yml | 4 ++-- eng/pipelines/coreclr/release-tests.yml | 4 ++-- eng/pipelines/coreclr/templates/test-job.yml | 4 ++-- eng/pipelines/runtime.yml | 12 ++++++------ 15 files changed, 23 insertions(+), 23 deletions(-) rename eng/pipelines/common/templates/{ => runtimes}/build-test-job.yml (100%) rename eng/pipelines/common/templates/{ => runtimes}/run-test-job.yml (100%) rename eng/pipelines/common/templates/{ => runtimes}/send-to-helix-step.yml (100%) diff --git a/eng/pipelines/common/templates/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml similarity index 100% rename from eng/pipelines/common/templates/build-test-job.yml rename to eng/pipelines/common/templates/runtimes/build-test-job.yml diff --git a/eng/pipelines/common/templates/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml similarity index 100% rename from eng/pipelines/common/templates/run-test-job.yml rename to eng/pipelines/common/templates/runtimes/run-test-job.yml diff --git a/eng/pipelines/common/templates/send-to-helix-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml similarity index 100% rename from eng/pipelines/common/templates/send-to-helix-step.yml rename to eng/pipelines/common/templates/runtimes/send-to-helix-step.yml diff --git a/eng/pipelines/coreclr/ci.yml b/eng/pipelines/coreclr/ci.yml index ce1fe419bb386..4982ffd0018bd 100644 --- a/eng/pipelines/coreclr/ci.yml +++ b/eng/pipelines/coreclr/ci.yml @@ -94,7 +94,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/build-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - Linux_arm @@ -113,7 +113,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platformGroup: all helixQueueGroup: ci @@ -127,7 +127,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - Linux_arm64 diff --git a/eng/pipelines/coreclr/corefx-jitstress.yml b/eng/pipelines/coreclr/corefx-jitstress.yml index 6557a778e5528..07acd4100062a 100644 --- a/eng/pipelines/coreclr/corefx-jitstress.yml +++ b/eng/pipelines/coreclr/corefx-jitstress.yml @@ -33,7 +33,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: # TODO: add Windows_NT_arm64, when we have hardware available. Note: platform-matrix.yml needs to enable a Helix queue for this. diff --git a/eng/pipelines/coreclr/corefx-jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/corefx-jitstress2-jitstressregs.yml index 9819acdfa8006..c58f8f575f383 100644 --- a/eng/pipelines/coreclr/corefx-jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/corefx-jitstress2-jitstressregs.yml @@ -33,7 +33,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: # TODO: add Windows_NT_arm64, when we have hardware available. Note: platform-matrix.yml needs to enable a Helix queue for this. diff --git a/eng/pipelines/coreclr/corefx-jitstressregs.yml b/eng/pipelines/coreclr/corefx-jitstressregs.yml index 11c5d1c12d4bf..ce064af729f91 100644 --- a/eng/pipelines/coreclr/corefx-jitstressregs.yml +++ b/eng/pipelines/coreclr/corefx-jitstressregs.yml @@ -33,7 +33,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: # TODO: add Windows_NT_arm64, when we have hardware available. Note: platform-matrix.yml needs to enable a Helix queue for this. diff --git a/eng/pipelines/coreclr/corefx.yml b/eng/pipelines/coreclr/corefx.yml index d83522951ad56..2f70f3f708303 100644 --- a/eng/pipelines/coreclr/corefx.yml +++ b/eng/pipelines/coreclr/corefx.yml @@ -33,7 +33,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: # TODO: add Windows_NT_arm64, when we have hardware available. Note: platform-matrix.yml needs to enable a Helix queue for this. diff --git a/eng/pipelines/coreclr/crossgen2-outerloop.yml b/eng/pipelines/coreclr/crossgen2-outerloop.yml index 4a98724962700..caf5444971ebb 100644 --- a/eng/pipelines/coreclr/crossgen2-outerloop.yml +++ b/eng/pipelines/coreclr/crossgen2-outerloop.yml @@ -40,7 +40,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml buildConfig: checked platforms: diff --git a/eng/pipelines/coreclr/crossgen2.yml b/eng/pipelines/coreclr/crossgen2.yml index 0a9b3cf75a9fd..ab6ccdf94246b 100644 --- a/eng/pipelines/coreclr/crossgen2.yml +++ b/eng/pipelines/coreclr/crossgen2.yml @@ -29,7 +29,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/build-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - OSX_x64 @@ -40,7 +40,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml buildConfig: checked platforms: diff --git a/eng/pipelines/coreclr/gc-longrunning.yml b/eng/pipelines/coreclr/gc-longrunning.yml index 5195927687fe2..d96ae6ef38b3f 100644 --- a/eng/pipelines/coreclr/gc-longrunning.yml +++ b/eng/pipelines/coreclr/gc-longrunning.yml @@ -43,7 +43,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: release platforms: - Linux_x64 diff --git a/eng/pipelines/coreclr/jitstress-isas-x86.yml b/eng/pipelines/coreclr/jitstress-isas-x86.yml index be611a80264cc..8c1241a1b371a 100644 --- a/eng/pipelines/coreclr/jitstress-isas-x86.yml +++ b/eng/pipelines/coreclr/jitstress-isas-x86.yml @@ -30,7 +30,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/coreclr/templates/build-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - OSX_x64 @@ -42,7 +42,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - Linux_x64 diff --git a/eng/pipelines/coreclr/release-tests.yml b/eng/pipelines/coreclr/release-tests.yml index 3a549dad7a0f7..06c5d6fdc9114 100644 --- a/eng/pipelines/coreclr/release-tests.yml +++ b/eng/pipelines/coreclr/release-tests.yml @@ -44,7 +44,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: release platformGroup: all helixQueueGroup: ci @@ -58,7 +58,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: release platformGroup: all helixQueueGroup: ci diff --git a/eng/pipelines/coreclr/templates/test-job.yml b/eng/pipelines/coreclr/templates/test-job.yml index ab3a4e48335e5..9c0cf47dd7f73 100644 --- a/eng/pipelines/coreclr/templates/test-job.yml +++ b/eng/pipelines/coreclr/templates/test-job.yml @@ -27,7 +27,7 @@ parameters: jobs: - ${{ if and(ne(parameters.corefxTests, true), eq(parameters.osSubgroup, parameters.managedTestBuildOsSubgroup), eq(parameters.osGroup, parameters.managedTestBuildOsGroup)) }}: - - template: /eng/pipelines/coreclr/templates/build-test-job.yml + - template: /eng/pipelines/common/templates/runtimes/build-test-job.yml parameters: buildConfig: ${{ parameters.buildConfig }} liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }} @@ -42,7 +42,7 @@ jobs: variables: ${{ parameters.variables }} pool: ${{ parameters.pool }} -- template: /eng/pipelines/common/templates/run-test-job.yml +- template: /eng/pipelines/common/templates/runtimes/run-test-job.yml parameters: buildConfig: ${{ parameters.buildConfig }} liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }} diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 65ecda49ce7ac..401fe77092e44 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -573,7 +573,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/build-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - Linux_arm @@ -594,7 +594,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/build-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - OSX_x64 @@ -615,7 +615,7 @@ jobs: # - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - Linux_arm @@ -634,7 +634,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - OSX_x64 @@ -657,7 +657,7 @@ jobs: # TODO: Add Windows_NT_x64 to platform ones the script for windows is written - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/build-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: release runtimeFlavor: mono platforms: @@ -680,7 +680,7 @@ jobs: # TODO: Add Windows_NT_x64 to platform ones the script for windows is written - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/templates/run-test-job.yml + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: release runtimeFlavor: mono platforms: From cad4ebe17d74905c814d4a12bd6df34929697a2d Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Thu, 16 Apr 2020 13:21:31 -0400 Subject: [PATCH 14/49] Changed invocation of build.sh to msbuild invocation. --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index ba7f8582a9aa5..1a0ba3fab4101 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -208,10 +208,10 @@ jobs: artifactName: '$(coreClrProductArtifactName)' displayName: 'CoreCLR product download for Mono' - - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) - -ci - -projects $(Build.SourcesDirectory)/src/mono/mono.proj + - script: $(_msbuildCommand) + $(Build.SourcesDirectory)/src/mono/mono.proj /t:PatchCoreClrCoreRoot + -ci displayName: "Patch dotnet with mono" From 6194735ef170eef8185b477fd4553d61d5fab3cf Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Thu, 16 Apr 2020 14:27:02 -0400 Subject: [PATCH 15/49] Fixed path. --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 1a0ba3fab4101..ea687ca9a224f 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -264,7 +264,7 @@ jobs: # Send tests to Helix - - template: /eng/pipelines/common/templates/send-to-helix-step.yml + - template: /eng/pipelines/common/templates/runtimes/send-to-helix-step.yml parameters: displayName: Send tests to Helix buildConfig: $(buildConfigUpper) From a4d9393a41e6e0c80f1fd658d3269095585b8909 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Thu, 16 Apr 2020 14:28:14 -0400 Subject: [PATCH 16/49] Removed trailing white space. --- eng/pipelines/mono/templates/build-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 551b386055eb1..40f952dac0052 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -54,7 +54,7 @@ jobs: - name: officialBuildIdArg value: '' - name: osOverride - value: '' + value: '' - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: - name: officialBuildIdArg value: '/p:officialBuildId=$(Build.BuildNumber)' From abe8ea2921a176232029e942aa7b66bbe6ba7844 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Thu, 16 Apr 2020 23:43:23 -0400 Subject: [PATCH 17/49] Removed bad -ci option from msbuild. --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index ea687ca9a224f..962c8f9c683e0 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -211,7 +211,6 @@ jobs: - script: $(_msbuildCommand) $(Build.SourcesDirectory)/src/mono/mono.proj /t:PatchCoreClrCoreRoot - -ci displayName: "Patch dotnet with mono" From f9f4f443a9c8a15d61943f48b6af2db212d22401 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Fri, 17 Apr 2020 11:48:49 -0400 Subject: [PATCH 18/49] Updated msbuild parameters. --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 962c8f9c683e0..b5e70c55a3efb 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -211,6 +211,7 @@ jobs: - script: $(_msbuildCommand) $(Build.SourcesDirectory)/src/mono/mono.proj /t:PatchCoreClrCoreRoot + /p:Configuration=$(buildConfig);BuildArchitecture=$(archType) displayName: "Patch dotnet with mono" From c64937cf0870da348b1d4e8a4851fb172fb401d0 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Fri, 17 Apr 2020 12:32:52 -0400 Subject: [PATCH 19/49] Removed tab. --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index b5e70c55a3efb..dd3e964cc6480 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -211,7 +211,7 @@ jobs: - script: $(_msbuildCommand) $(Build.SourcesDirectory)/src/mono/mono.proj /t:PatchCoreClrCoreRoot - /p:Configuration=$(buildConfig);BuildArchitecture=$(archType) + /p:Configuration=$(buildConfig);BuildArchitecture=$(archType) displayName: "Patch dotnet with mono" From 972c9694e8cfe67d66bf9d0cde608da8e35e9e64 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Fri, 17 Apr 2020 12:52:56 -0400 Subject: [PATCH 20/49] Spacing change. --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index dd3e964cc6480..8ef6bacb6d49b 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -215,6 +215,7 @@ jobs: displayName: "Patch dotnet with mono" + # Download and unzip the Microsoft.NET.Sdk.IL package needed for traversing # ilproj test projects during copynativeonly. - ${{ if ne(parameters.corefxTests, true) }}: From b5e1c8309d9d8c48e70b9216d7756dbf0107b6f9 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Fri, 17 Apr 2020 13:10:59 -0400 Subject: [PATCH 21/49] Eliminated extra new line. --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 8ef6bacb6d49b..dd3e964cc6480 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -215,7 +215,6 @@ jobs: displayName: "Patch dotnet with mono" - # Download and unzip the Microsoft.NET.Sdk.IL package needed for traversing # ilproj test projects during copynativeonly. - ${{ if ne(parameters.corefxTests, true) }}: From d9b7d0e6aa972e868dbf8ba24867c414ae3b2914 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Fri, 17 Apr 2020 16:19:33 -0400 Subject: [PATCH 22/49] Change how runtime flavor is propagated. --- src/coreclr/build-test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index cfaa95f298efe..f7c38f6e301e2 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -6,9 +6,9 @@ build_test_wrappers() echo "${__MsgPrefix}Creating test wrappers..." if [[ $__Mono -eq 1 ]]; then - export RuntimeFlavor="mono" + RuntimeFlavor="mono" else - export RuntimeFlavor="coreclr" + RuntimeFlavor="coreclr" fi __Exclude="${__ProjectDir}/tests/issues.targets" @@ -32,7 +32,7 @@ build_test_wrappers() __MsbuildErr="/fileloggerparameters2:\"ErrorsOnly;LogFile=${__BuildErr}\"" __Logging="$__MsbuildLog $__MsbuildWrn $__MsbuildErr /consoleloggerparameters:$buildVerbosity" - nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch" + nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RunimeFlavor=$RuntimeFlavor" eval $nextCommand local exitCode="$?" From ff1050eeac0be29e6550f9c54d0107fe1ed27c04 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Fri, 17 Apr 2020 16:29:36 -0400 Subject: [PATCH 23/49] Changes to build-test. --- src/coreclr/build-test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index f7c38f6e301e2..a37b8fabd1ea0 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -6,9 +6,9 @@ build_test_wrappers() echo "${__MsgPrefix}Creating test wrappers..." if [[ $__Mono -eq 1 ]]; then - RuntimeFlavor="mono" + __RuntimeFlavor="mono" else - RuntimeFlavor="coreclr" + __RuntimeFlavor="coreclr" fi __Exclude="${__ProjectDir}/tests/issues.targets" @@ -32,7 +32,7 @@ build_test_wrappers() __MsbuildErr="/fileloggerparameters2:\"ErrorsOnly;LogFile=${__BuildErr}\"" __Logging="$__MsbuildLog $__MsbuildWrn $__MsbuildErr /consoleloggerparameters:$buildVerbosity" - nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RunimeFlavor=$RuntimeFlavor" + nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor" eval $nextCommand local exitCode="$?" From b35a65a56ba4111a7edc6e26464b5fd6e78d6162 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Fri, 17 Apr 2020 18:28:22 -0400 Subject: [PATCH 24/49] Added binlog. --- src/coreclr/build-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index a37b8fabd1ea0..6099f9cb1fd51 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -32,7 +32,7 @@ build_test_wrappers() __MsbuildErr="/fileloggerparameters2:\"ErrorsOnly;LogFile=${__BuildErr}\"" __Logging="$__MsbuildLog $__MsbuildWrn $__MsbuildErr /consoleloggerparameters:$buildVerbosity" - nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor" + nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor /bl:build_test.binlog" eval $nextCommand local exitCode="$?" From d7fbb17d563a1f8a781de780433b04531b1a5640 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Fri, 17 Apr 2020 18:48:06 -0400 Subject: [PATCH 25/49] Added binlog 2. --- src/coreclr/build-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index 6099f9cb1fd51..87f0da811dce4 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -32,7 +32,7 @@ build_test_wrappers() __MsbuildErr="/fileloggerparameters2:\"ErrorsOnly;LogFile=${__BuildErr}\"" __Logging="$__MsbuildLog $__MsbuildWrn $__MsbuildErr /consoleloggerparameters:$buildVerbosity" - nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor /bl:build_test.binlog" + nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor /bl:${__RepoRootDir}/artifacts/log/runTests.binlog" eval $nextCommand local exitCode="$?" From fd7ff96b640cee3b0a211f65307284993a3ec864 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Mon, 20 Apr 2020 11:05:24 -0400 Subject: [PATCH 26/49] Added runtime-flavor-arg in run-test-job.yml --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index dd3e964cc6480..24bc37044dd77 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -78,6 +78,10 @@ jobs: - name: testhostArg value: 'buildtesthostonly' + - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: + - name: runtimeFlavorArgs + - value: '-excludemonofailures' + - name: crossgenArg value: '' - name: LogNamePrefix @@ -248,7 +252,7 @@ jobs: # Generate test host - ${{ if eq(parameters.corefxTests, true) }}: - - script: $(coreClrRepoRootDir)build-test$(scriptExt) skipmanaged skipnative $(testhostArg) $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(librariesOverrideArg) + - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(runtimeFlavorArgs) skipmanaged skipnative $(testhostArg) $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(librariesOverrideArg) displayName: Generate test host From 13d8bce3916c0c31f7eef93728e4c0e2aa2edb1e Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Mon, 20 Apr 2020 11:29:58 -0400 Subject: [PATCH 27/49] Updated comment, moved runtimeFlavorArgs to the right place. --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 24bc37044dd77..c33c1b882ae9e 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -252,12 +252,12 @@ jobs: # Generate test host - ${{ if eq(parameters.corefxTests, true) }}: - - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(runtimeFlavorArgs) skipmanaged skipnative $(testhostArg) $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(librariesOverrideArg) + - script: $(coreClrRepoRootDir)build-test$(scriptExt) skipmanaged skipnative $(testhostArg) $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(librariesOverrideArg) displayName: Generate test host - # Generate test wrappers - - script: $(coreClrRepoRootDir)build-test$(scriptExt) buildtestwrappersonly $(crossgenArg) $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(librariesOverrideArg) + # Generate test wrappers. This is the step that examines issues.targets to exclude tests. + - script: $(coreClrRepoRootDir)build-test$(scriptExt) buildtestwrappersonly $(runtimeFlavorArgs) $(crossgenArg) $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(librariesOverrideArg) displayName: Generate test wrappers From 21e2af1d23165361adb5c00d2d656cd5994f5c66 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Mon, 20 Apr 2020 12:47:44 -0400 Subject: [PATCH 28/49] Fixed runtime flavor arg. --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index c33c1b882ae9e..518ddca6a1fce 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -78,9 +78,12 @@ jobs: - name: testhostArg value: 'buildtesthostonly' + - name: runtimeFlavorArgs + - value: '' + - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - name: runtimeFlavorArgs - - value: '-excludemonofailures' + - value: 'mono' - name: crossgenArg value: '' From fc3da88555b3d97afeb646fa2dd06b60e1e6e3c2 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Mon, 20 Apr 2020 14:57:49 -0400 Subject: [PATCH 29/49] Added runtime flavor to log prefix. --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 518ddca6a1fce..110c0c6df9869 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -451,6 +451,6 @@ jobs: displayName: Publish Logs inputs: targetPath: $(Build.SourcesDirectory)/artifacts/log - artifactName: '$(LogNamePrefix)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' + artifactName: '$(runtimeFlavor)_$(LogNamePrefix)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' continueOnError: true condition: always() From 09552487053b88911959962955d5c8f013d61fbf Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Mon, 20 Apr 2020 15:15:34 -0400 Subject: [PATCH 30/49] Fixed runtimeFlavorArg --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 110c0c6df9869..116c1b425c9bc 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -83,7 +83,7 @@ jobs: - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - name: runtimeFlavorArgs - - value: 'mono' + - value: '-excludemonofailures' - name: crossgenArg value: '' From 434d08f9b17c218dfe3187bfd8162edb0b8c9b39 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Mon, 20 Apr 2020 15:30:13 -0400 Subject: [PATCH 31/49] Added runtimeFlavor to log names. --- eng/pipelines/common/templates/runtimes/build-test-job.yml | 2 +- eng/pipelines/common/templates/runtimes/run-test-job.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index f360eb1843244..641fc055f1097 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -159,6 +159,6 @@ jobs: displayName: Publish Logs inputs: targetPath: $(Build.SourcesDirectory)/artifacts/log - artifactName: 'TestBuildLogs_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' + artifactName: '${{ parameters.runtimeFlavor }}_TestBuildLogs_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' continueOnError: true condition: always() diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 116c1b425c9bc..11da87a4d1bd5 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -451,6 +451,6 @@ jobs: displayName: Publish Logs inputs: targetPath: $(Build.SourcesDirectory)/artifacts/log - artifactName: '$(runtimeFlavor)_$(LogNamePrefix)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' + artifactName: '${{ parameters.runtimeFlavor }}_$(LogNamePrefix)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' continueOnError: true condition: always() From 8f60fbf8369b3e4b51cdcfa3f99e3f6a18732963 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Mon, 20 Apr 2020 16:58:09 -0400 Subject: [PATCH 32/49] Fixed runtime flavor arg value. --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 11da87a4d1bd5..e8fc7089ad768 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -79,11 +79,11 @@ jobs: value: 'buildtesthostonly' - name: runtimeFlavorArgs - - value: '' + value: '' - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - name: runtimeFlavorArgs - - value: '-excludemonofailures' + value: '-excludemonofailures' - name: crossgenArg value: '' From 8bbe8ebf641d03002aaa46386c45eb939f51811c Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Mon, 20 Apr 2020 17:20:13 -0400 Subject: [PATCH 33/49] Changed build architecture to build architecture. --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index e8fc7089ad768..96d66c5fc2e77 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -218,7 +218,7 @@ jobs: - script: $(_msbuildCommand) $(Build.SourcesDirectory)/src/mono/mono.proj /t:PatchCoreClrCoreRoot - /p:Configuration=$(buildConfig);BuildArchitecture=$(archType) + /p:Configuration=$(buildConfig);TargetArchitecture=$(archType) displayName: "Patch dotnet with mono" From 0a0377a3e2f9ae13e52f60401d11ed3060773149 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Mon, 20 Apr 2020 18:18:00 -0400 Subject: [PATCH 34/49] Excluded hijacking test on *all* unix targets. --- src/coreclr/tests/issues.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets index 2a2f6dc840cdb..e460b7424aeb2 100644 --- a/src/coreclr/tests/issues.targets +++ b/src/coreclr/tests/issues.targets @@ -122,6 +122,9 @@ Unix does not support tailcall helper + + Unix does not support tailcall helper + @@ -129,9 +132,6 @@ https://github.com/dotnet/runtime/issues/12166 - - Unix does not support tailcall helper - From edd9764b410941dc57c16b002e774eab648acb6e Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Mon, 20 Apr 2020 18:31:20 -0400 Subject: [PATCH 35/49] Use multiple /p flags for windows cmd shell compatibility. --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 96d66c5fc2e77..4eec6bc95df84 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -218,7 +218,8 @@ jobs: - script: $(_msbuildCommand) $(Build.SourcesDirectory)/src/mono/mono.proj /t:PatchCoreClrCoreRoot - /p:Configuration=$(buildConfig);TargetArchitecture=$(archType) + /p:Configuration=$(buildConfig) + /p:TargetArchitecture=$(archType) displayName: "Patch dotnet with mono" From e04b3bd46e66a351ad4c48c2f2b515f3ceef5829 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Mon, 20 Apr 2020 21:28:23 -0400 Subject: [PATCH 36/49] Removed unecessary mono stuff from build-test-job. --- .../templates/runtimes/build-test-job.yml | 15 ++++----- .../templates/runtimes/run-test-job.yml | 4 +-- eng/pipelines/runtime.yml | 32 +++++++++---------- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 641fc055f1097..b87de3f6256d6 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -44,9 +44,6 @@ jobs: stagedBuild: ${{ parameters.stagedBuild }} liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }} variables: - - runtimeFlavorArgs: '' - - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - - runtimeFlavorArgs: '-excludemonofailures' - ${{ each variable in parameters.variables }}: - ${{insert}}: ${{ variable }} pool: ${{ parameters.pool }} @@ -56,12 +53,12 @@ jobs: continueOnError: true ${{ if eq(parameters.testGroup, 'innerloop') }}: - name: '${{ parameters.runtimeFlavor }}_test_build_p0_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' - displayName: '${{ parameters.runtimeFlavorDisplayName }} Pri0 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' + name: 'common_runtime_test_build_p0_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' + displayName: 'Common Runtime Pri0 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' ${{ if ne(parameters.testGroup, 'innerloop') }}: - name: '${{ parameters.runtimeFlavor }}_test_build_p1_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' - displayName: '${{ parameters.runtimeFlavorDisplayName }} Pri1 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' + name: '$common_runtime_test_build_p1_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' + displayName: 'Common RUntime Pri1 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' # Since the condition is being altered, merge the default with the additional conditions. # See https://docs.microsoft.com/azure/devops/pipelines/process/conditions @@ -125,7 +122,7 @@ jobs: # Build managed test components - - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(runtimeFlavorArgs) skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(crossArg) $(priorityArg) ci $(librariesOverrideArg) + - script: $(coreClrRepoRootDir)build-test$(scriptExt) skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(crossArg) $(priorityArg) ci $(librariesOverrideArg) displayName: Build managed test components @@ -159,6 +156,6 @@ jobs: displayName: Publish Logs inputs: targetPath: $(Build.SourcesDirectory)/artifacts/log - artifactName: '${{ parameters.runtimeFlavor }}_TestBuildLogs_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' + artifactName: 'Common_Runtime_TestBuildLogs_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' continueOnError: true condition: always() diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 4eec6bc95df84..60108aecdd7e5 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -54,9 +54,9 @@ jobs: dependsOn: - ${{ if ne(parameters.corefxTests, true) }}: - ${{ if eq(parameters.testGroup, 'innerloop') }}: - - '${{ parameters.runtimeFlavor }}_test_build_p0_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' + - 'common_runtime_test_build_p0_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' - ${{ if ne(parameters.testGroup, 'innerloop') }}: - - '${{ parameters.runtimeFlavor }}_test_build_p1_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' + - 'common_runtime_test_build_p1_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' - ${{ if ne(parameters.stagedBuild, true) }}: - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 401fe77092e44..a12abe5e0d6ea 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -655,24 +655,24 @@ jobs: # Mono Test builds with CoreCLR runtime tests using live libraries debug build # Only when Mono is changed # TODO: Add Windows_NT_x64 to platform ones the script for windows is written -- template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml - buildConfig: release - runtimeFlavor: mono - platforms: - - OSX_x64 +#- template: /eng/pipelines/common/platform-matrix.yml +# parameters: +# jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml +# buildConfig: release +# runtimeFlavor: mono +# platforms: +# - OSX_x64 # - Linux_x64 # - Linux_arm64 - jobParameters: - testGroup: innerloop - liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} - liveRuntimeBuildConfig: release - runtimeFlavorDisplayName: 'Mono' - condition: >- - or( - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(variables['isFullMatrix'], true)) +# jobParameters: +# testGroup: innerloop +# liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} +# liveRuntimeBuildConfig: release +# runtimeFlavorDisplayName: 'Mono' +# condition: >- +# or( +# eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), +# eq(variables['isFullMatrix'], true)) # # Mono CoreCLR runtime Test executions using live libraries From d5042ef150ca044fd8f3ab1939d054fb080c1bd9 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Mon, 20 Apr 2020 21:34:24 -0400 Subject: [PATCH 37/49] Changed runtime.yml --- eng/pipelines/runtime.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index a12abe5e0d6ea..401fe77092e44 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -655,24 +655,24 @@ jobs: # Mono Test builds with CoreCLR runtime tests using live libraries debug build # Only when Mono is changed # TODO: Add Windows_NT_x64 to platform ones the script for windows is written -#- template: /eng/pipelines/common/platform-matrix.yml -# parameters: -# jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml -# buildConfig: release -# runtimeFlavor: mono -# platforms: -# - OSX_x64 +- template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml + buildConfig: release + runtimeFlavor: mono + platforms: + - OSX_x64 # - Linux_x64 # - Linux_arm64 -# jobParameters: -# testGroup: innerloop -# liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} -# liveRuntimeBuildConfig: release -# runtimeFlavorDisplayName: 'Mono' -# condition: >- -# or( -# eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), -# eq(variables['isFullMatrix'], true)) + jobParameters: + testGroup: innerloop + liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} + liveRuntimeBuildConfig: release + runtimeFlavorDisplayName: 'Mono' + condition: >- + or( + eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(variables['isFullMatrix'], true)) # # Mono CoreCLR runtime Test executions using live libraries From e0e8436532a6575c9cf62acd16e542e61b0b76ce Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Mon, 20 Apr 2020 23:28:42 -0400 Subject: [PATCH 38/49] White space. --- eng/pipelines/runtime.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 401fe77092e44..2630469b050db 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -699,6 +699,7 @@ jobs: eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) + # # Libraries Release Test Execution against a release mono runtime. # Only when libraries or mono changed From 6d08bf72d798f77fe003bd77e4c502b6f2c5740e Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 21 Apr 2020 00:13:18 -0400 Subject: [PATCH 39/49] Removed extra white space. --- eng/pipelines/runtime.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 2630469b050db..401fe77092e44 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -699,7 +699,6 @@ jobs: eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) - # # Libraries Release Test Execution against a release mono runtime. # Only when libraries or mono changed From 90a77f0ac978a4c677aadd14e542c69edc1f251a Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 21 Apr 2020 10:38:27 -0400 Subject: [PATCH 40/49] Added runtime flavor as log prefix. --- eng/pipelines/common/templates/runtimes/build-test-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index b87de3f6256d6..5eda49f934d4d 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -156,6 +156,6 @@ jobs: displayName: Publish Logs inputs: targetPath: $(Build.SourcesDirectory)/artifacts/log - artifactName: 'Common_Runtime_TestBuildLogs_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' + artifactName: '${{ parameters.runtimeFlavor }}_Common_Runtime_TestBuildLogs_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' continueOnError: true condition: always() From 2b33b55ff31d1a9c7783d2d302dd80767e3786cc Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 21 Apr 2020 14:39:51 -0400 Subject: [PATCH 41/49] Put runtime flavor back in test build names. --- .../common/templates/runtimes/build-test-job.yml | 8 ++++---- eng/pipelines/common/templates/runtimes/run-test-job.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 5eda49f934d4d..07896b41e87cf 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -53,12 +53,12 @@ jobs: continueOnError: true ${{ if eq(parameters.testGroup, 'innerloop') }}: - name: 'common_runtime_test_build_p0_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' - displayName: 'Common Runtime Pri0 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' + name: '${{ parameters.runtimeFlavor }}_common_test_build_p0_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' + displayName: '${{ parameters.runtimeFlavor }} Common Pri0 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' ${{ if ne(parameters.testGroup, 'innerloop') }}: - name: '$common_runtime_test_build_p1_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' - displayName: 'Common RUntime Pri1 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' + name: '${{ parameters.runtimeFlavor }}_common_test_build_p1_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' + displayName: '${{ parameters.runtimeFlavor }}Common Pri1 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' # Since the condition is being altered, merge the default with the additional conditions. # See https://docs.microsoft.com/azure/devops/pipelines/process/conditions diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 60108aecdd7e5..ba72a9aababf0 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -54,9 +54,9 @@ jobs: dependsOn: - ${{ if ne(parameters.corefxTests, true) }}: - ${{ if eq(parameters.testGroup, 'innerloop') }}: - - 'common_runtime_test_build_p0_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' + - '${{ parameters.runtimeFlavor }}_common_test_build_p0_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' - ${{ if ne(parameters.testGroup, 'innerloop') }}: - - 'common_runtime_test_build_p1_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' + - '${{ parameters.runtimeFlavor }}_common_test_build_p1_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}' - ${{ if ne(parameters.stagedBuild, true) }}: - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: From 0976a7da914fc44fd9637911612aa57cd90440c3 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 21 Apr 2020 15:09:54 -0400 Subject: [PATCH 42/49] Switched to display name. --- eng/pipelines/common/templates/runtimes/build-test-job.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 07896b41e87cf..2fa7710ed0bec 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -54,11 +54,11 @@ jobs: ${{ if eq(parameters.testGroup, 'innerloop') }}: name: '${{ parameters.runtimeFlavor }}_common_test_build_p0_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' - displayName: '${{ parameters.runtimeFlavor }} Common Pri0 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' + displayName: '${{ parameters.runtimeFlavorDisplayName }} Common Pri0 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' ${{ if ne(parameters.testGroup, 'innerloop') }}: name: '${{ parameters.runtimeFlavor }}_common_test_build_p1_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' - displayName: '${{ parameters.runtimeFlavor }}Common Pri1 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' + displayName: '${{ parameters.runtimeFlavorDisplayName }}Common Pri1 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' # Since the condition is being altered, merge the default with the additional conditions. # See https://docs.microsoft.com/azure/devops/pipelines/process/conditions From d43938829e1d102f4d6d322be7dda5fed21939c7 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 21 Apr 2020 17:23:18 -0400 Subject: [PATCH 43/49] Added spaces; remvoed unneeded variable setting. --- eng/pipelines/common/templates/runtimes/build-test-job.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 2fa7710ed0bec..00a072edc599a 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -43,9 +43,7 @@ jobs: testGroup: ${{ parameters.testGroup }} stagedBuild: ${{ parameters.stagedBuild }} liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }} - variables: - - ${{ each variable in parameters.variables }}: - - ${{insert}}: ${{ variable }} + variables: ${{ parameters.variables }} pool: ${{ parameters.pool }} # Test jobs should continue on error for internal builds @@ -58,7 +56,7 @@ jobs: ${{ if ne(parameters.testGroup, 'innerloop') }}: name: '${{ parameters.runtimeFlavor }}_common_test_build_p1_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}' - displayName: '${{ parameters.runtimeFlavorDisplayName }}Common Pri1 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' + displayName: '${{ parameters.runtimeFlavorDisplayName }} Common Pri1 Test Build ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}' # Since the condition is being altered, merge the default with the additional conditions. # See https://docs.microsoft.com/azure/devops/pipelines/process/conditions From 4f988fbc455f638f1a35c8c1fd4959605d778d6a Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 21 Apr 2020 18:39:42 -0400 Subject: [PATCH 44/49] Removed priority arg. --- eng/pipelines/mono/templates/xplat-job.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/pipelines/mono/templates/xplat-job.yml b/eng/pipelines/mono/templates/xplat-job.yml index c6e8864e41137..899f36ef85ad8 100644 --- a/eng/pipelines/mono/templates/xplat-job.yml +++ b/eng/pipelines/mono/templates/xplat-job.yml @@ -96,10 +96,6 @@ jobs: - name: coreClrRepoRootDir value: '$(coreClrRepoRoot)$(dir)' - - name: priorityArg - value: '' - - - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: - name: _HelixSource value: official/dotnet/runtime/$(Build.SourceBranch) From 6206d11ff9f34fc5310ea5cfaa872d289c008711 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 21 Apr 2020 18:46:17 -0400 Subject: [PATCH 45/49] Changed build-test binlog name. --- src/coreclr/build-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index 87f0da811dce4..7f34e6c842b0c 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -32,7 +32,7 @@ build_test_wrappers() __MsbuildErr="/fileloggerparameters2:\"ErrorsOnly;LogFile=${__BuildErr}\"" __Logging="$__MsbuildLog $__MsbuildWrn $__MsbuildErr /consoleloggerparameters:$buildVerbosity" - nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor /bl:${__RepoRootDir}/artifacts/log/runTests.binlog" + nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor /bl:${__RepoRootDir}/artifacts/log/build_test_wrappers_${__RuntimeFlavor.binlog} eval $nextCommand local exitCode="$?" From 18a72b693ff8022721f88c138f4c0be28de05321 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 21 Apr 2020 18:47:15 -0400 Subject: [PATCH 46/49] Changed build-test binlog name. --- src/coreclr/build-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index 7f34e6c842b0c..70309dfac9bed 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -32,7 +32,7 @@ build_test_wrappers() __MsbuildErr="/fileloggerparameters2:\"ErrorsOnly;LogFile=${__BuildErr}\"" __Logging="$__MsbuildLog $__MsbuildWrn $__MsbuildErr /consoleloggerparameters:$buildVerbosity" - nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor /bl:${__RepoRootDir}/artifacts/log/build_test_wrappers_${__RuntimeFlavor.binlog} + nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor /bl:${__RepoRootDir}/artifacts/log/${__BuildType}/build_test_wrappers_${__RuntimeFlavor.binlog} eval $nextCommand local exitCode="$?" From 30fba0ae7760d2d48678b9c84f174361fd35332c Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 21 Apr 2020 18:50:46 -0400 Subject: [PATCH 47/49] Removed commented out platform. --- eng/pipelines/runtime.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 401fe77092e44..3863f8d26c653 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -654,7 +654,6 @@ jobs: # # Mono Test builds with CoreCLR runtime tests using live libraries debug build # Only when Mono is changed -# TODO: Add Windows_NT_x64 to platform ones the script for windows is written - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -662,8 +661,6 @@ jobs: runtimeFlavor: mono platforms: - OSX_x64 - # - Linux_x64 - # - Linux_arm64 jobParameters: testGroup: innerloop liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} @@ -677,7 +674,6 @@ jobs: # # Mono CoreCLR runtime Test executions using live libraries # Only when Mono is changed -# TODO: Add Windows_NT_x64 to platform ones the script for windows is written - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -685,8 +681,6 @@ jobs: runtimeFlavor: mono platforms: - OSX_x64 - # - Linux_x64 - # - Linux_arm64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: From af86454a1d03857912a1af4a65640ba479db40c1 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 21 Apr 2020 19:24:37 -0400 Subject: [PATCH 48/49] Moved bracket to correct place. --- src/coreclr/build-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index 70309dfac9bed..d25e9fb99b27b 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -32,7 +32,7 @@ build_test_wrappers() __MsbuildErr="/fileloggerparameters2:\"ErrorsOnly;LogFile=${__BuildErr}\"" __Logging="$__MsbuildLog $__MsbuildWrn $__MsbuildErr /consoleloggerparameters:$buildVerbosity" - nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor /bl:${__RepoRootDir}/artifacts/log/${__BuildType}/build_test_wrappers_${__RuntimeFlavor.binlog} + nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor /bl:${__RepoRootDir}/artifacts/log/${__BuildType}/build_test_wrappers_${__RuntimeFlavor}.binlog eval $nextCommand local exitCode="$?" From 175627e39e50d32584764542cf361f4bb3e0ed19 Mon Sep 17 00:00:00 2001 From: Nathan Ricci Date: Tue, 21 Apr 2020 20:27:33 -0400 Subject: [PATCH 49/49] Fixed quotes. --- src/coreclr/build-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index d25e9fb99b27b..c22c8ae949f79 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -32,7 +32,7 @@ build_test_wrappers() __MsbuildErr="/fileloggerparameters2:\"ErrorsOnly;LogFile=${__BuildErr}\"" __Logging="$__MsbuildLog $__MsbuildWrn $__MsbuildErr /consoleloggerparameters:$buildVerbosity" - nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor /bl:${__RepoRootDir}/artifacts/log/${__BuildType}/build_test_wrappers_${__RuntimeFlavor}.binlog + nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor \"/bl:${__RepoRootDir}/artifacts/log/${__BuildType}/build_test_wrappers_${__RuntimeFlavor}.binlog\"" eval $nextCommand local exitCode="$?"