diff options
| author | smile21prc <xiwe@microsoft.com> | 2017-08-17 10:42:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-17 10:42:22 -0700 |
| commit | b2b5fef27a4cb68571549f2e19660f39bd76467b (patch) | |
| tree | eb413e3bcf0b97ac2efaef54a872479da96ea4bc /buildpipeline | |
| parent | 6e01319382dff1a08412602df207a7d38ed61526 (diff) | |
| download | coreclr-b2b5fef27a4cb68571549f2e19660f39bd76467b.tar.gz coreclr-b2b5fef27a4cb68571549f2e19660f39bd76467b.tar.bz2 coreclr-b2b5fef27a4cb68571549f2e19660f39bd76467b.zip | |
Enable RedHat 6 in coreclr master (#13315)
* Enable RedHat 6 in coreclr master
Enable RedHat 6 in coreclr master.
This is identical as the approved PR to enable RedHat 6 in coreclr
release/2.0.0:
https://github.com/dotnet/coreclr/pull/13301
* Correct Rid to match /src/.nuget/dirs.props
Correct Rid to match /src/.nuget/dirs.props
* Update dockertag and add logic to detect RHEL6 in init-tools.sh
Update dockertag and add logic to detect RHEL6 in init-tools.sh
* Port changes from Release/2.0.0 to fix coreclr RHEL 6 official runs.
Port changes from Release/2.0.0 to fix coreclr RHEL 6 official runs.
* Remove empty quotes.
Remove empty quotes.
Diffstat (limited to 'buildpipeline')
| -rw-r--r-- | buildpipeline/DotNet-CoreClr-Trusted-Linux.json | 7 | ||||
| -rw-r--r-- | buildpipeline/pipelines.json | 51 |
2 files changed, 55 insertions, 3 deletions
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json index fc68378991..b20c7db895 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json @@ -121,7 +121,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -- /flp:\"v=diag\"", + "arguments": "run --rm $(DockerCommonRunArgs) ./build.sh $(PB_BuildType) $(Architecture) skipnuget -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) $(PB_AdditionalBuildArgs) -- /flp:\"v=diag\"", "workingFolder": "", "failOnStandardError": "false" } @@ -139,7 +139,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -- /p:OfficialBuildId=$(OfficialBuildId)", + "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) $(PB_AdditionalBuildArgs) -- /p:OfficialBuildId=$(OfficialBuildId)", "workingFolder": "", "failOnStandardError": "false" } @@ -369,6 +369,9 @@ }, "PB_CleanAgent": { "value": "true" + }, + "PB_AdditionalBuildArgs": { + "value":"" } }, "demands": [ diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json index 01fd417b80..46b647ea84 100644 --- a/buildpipeline/pipelines.json +++ b/buildpipeline/pipelines.json @@ -24,6 +24,20 @@ } }, { + "Name": "DotNet-CoreClr-Trusted-Linux", + "Parameters": { + "DockerTag": "centos-6-c8c9b08-20174310104313", + "Rid": "rhel.6", + "PB_AdditionalBuildArgs": "-portablebuild=false" + }, + "ReportingParameters": { + "OperatingSystem": "RedHat6", + "Type": "build/product/", + "Architecture": "x64", + "PB_BuildType": null + } + }, + { "Name": "DotNet-CoreClr-Trusted-Mac", "Parameters": { "Rid": "osx" @@ -460,7 +474,42 @@ "Type": "build/product/", "PB_BuildType": "Release" } - } + }, + { + "Name": "Dotnet-CoreClr-Trusted-BuildTests", + "Parameters": { + "HelixJobType": "test/functional/cli/", + "TargetsWindows": "false", + "Rid": "rhel.6-x64", + "TargetQueues": "redhat.69.amd64", + "TestContainerSuffix": "rhel6", + "TargetsNonWindowsArg": "TargetsNonWindows " + }, + "ReportingParameters": { + "OperatingSystem": "RedHat6", + "SubType": "Build-Tests", + "Type": "build/product/", + "PB_BuildType": "Release" + } + }, + { + "Name": "Dotnet-CoreClr-Trusted-BuildTests", + "Parameters": { + "HelixJobType": "test/functional/r2r/cli/", + "TargetsWindows": "false", + "Rid": "rhel.6-x64", + "TargetQueues": "redhat.69.amd64", + "TestContainerSuffix": "rhel6-r2r", + "CrossgenArg": "Crossgen ", + "TargetsNonWindowsArg": "TargetsNonWindows " + }, + "ReportingParameters": { + "OperatingSystem": "RedHat6", + "SubType": "Build-Tests-R2R", + "Type": "build/product/", + "PB_BuildType": "Release" + } + } ], "DependsOn": [ "Trusted-All-Release" |