diff options
author | Juan Carlos Aguilera Mendez <juanam@microsoft.com> | 2018-03-16 09:50:50 -0700 |
---|---|---|
committer | Juan Carlos Aguilera Mendez <juanam@microsoft.com> | 2018-03-16 09:50:50 -0700 |
commit | f7823fb541745735d7566dfb376d9fd7c750c7a8 (patch) | |
tree | ad2c68d0ac2c2de568f88cd7dc96dd7c12695a01 /buildpipeline | |
parent | 8b54e0b93f795ba983ce2f4b99ed85769ef25d03 (diff) | |
parent | ed49badc8baf90bca56b2df0b98eb20355d9a998 (diff) | |
download | coreclr-f7823fb541745735d7566dfb376d9fd7c750c7a8.tar.gz coreclr-f7823fb541745735d7566dfb376d9fd7c750c7a8.tar.bz2 coreclr-f7823fb541745735d7566dfb376d9fd7c750c7a8.zip |
Merge branch 'master' of https://github.com/dotnet/coreclr
Diffstat (limited to 'buildpipeline')
-rw-r--r-- | buildpipeline/pipelines.json | 204 | ||||
-rw-r--r-- | buildpipeline/tests/test_pipelines.json | 8 |
2 files changed, 19 insertions, 193 deletions
diff --git a/buildpipeline/pipelines.json b/buildpipeline/pipelines.json index e48305dcd4..b38243fdcc 100644 --- a/buildpipeline/pipelines.json +++ b/buildpipeline/pipelines.json @@ -141,6 +141,21 @@ "Architecture": "arm", "PB_BuildType": null } + }, + { + "Name": "DotNet-CoreClr-Trusted-Linux-Crossbuild", + "Parameters": { + "DockerTag": "ubuntu-16.04-cross-arm64-a3ae44b-20180315221921", + "Architecture": "arm64", + "Rid": "linux" + }, + "ReportingParameters": { + "OperatingSystem": "Linux", + "SubType": "PortableCrossBuild", + "Type": "build/product/", + "Architecture": "arm64", + "PB_BuildType": null + } } ] } @@ -352,195 +367,6 @@ "Trusted-All-Checked", "Trusted-Crossbuild-Checked" ] - }, - { - "Name": "Build And Run Tests - Release", - "Parameters": { - "TreatWarningsAsErrors": "false" - }, - "BuildParameters": { - "PB_BuildType": "Release" - }, - "Definitions": [ - { - "Name": "Dotnet-CoreClr-Trusted-BuildTests", - "Parameters": { - "HelixJobType": "test/functional/cli/", - "TargetsWindows": "true", - "Rid": "win-x64", - "TargetQueues": "Windows.10.Amd64,Windows.10.Nano.Amd64,Windows.10.Amd64.Core,Windows.7.Amd64,Windows.81.Amd64", - "TestContainerSuffix": "windows", - }, - "ReportingParameters": { - "OperatingSystem": "Windows", - "SubType": "Build-Tests", - "Type": "build/product/", - "PB_BuildType": "Release" - } - }, - { - "Name": "Dotnet-CoreClr-Trusted-BuildTests", - "Parameters": { - "HelixJobType": "test/functional/r2r/cli/", - "TargetsWindows": "true", - "Rid": "win-x64", - "TargetQueues": "Windows.10.Amd64,Windows.10.Nano.Amd64,Windows.10.Amd64.Core,Windows.7.Amd64,Windows.81.Amd64", - "TestContainerSuffix": "windows-r2r", - "CrossgenArg": "Crossgen " - }, - "ReportingParameters": { - "OperatingSystem": "Windows", - "SubType": "Build-Tests-R2R", - "Type": "build/product/", - "PB_BuildType": "Release" - } - }, - { - "Name": "Dotnet-CoreClr-Trusted-BuildTests", - "Parameters": { - "Architecture": "arm", - "HelixJobType": "test/functional/cli/", - "TargetsWindows": "true", - "Rid": "win-arm", - "TargetQueues": "windows.10.arm64", - "TestContainerSuffix": "windows", - }, - "ReportingParameters": { - "OperatingSystem": "Windows", - "Architecture": "arm64", - "SubType": "Build-Tests", - "Type": "build/product/", - "PB_BuildType": "Release" - } - }, - { - "Name": "Dotnet-CoreClr-Trusted-BuildTests", - "Parameters": { - "Architecture": "arm", - "HelixJobType": "test/functional/r2r/cli/", - "TargetsWindows": "true", - "Rid": "win-arm", - "TargetQueues": "windows.10.arm64", - "TestContainerSuffix": "windows-r2r", - "CrossgenArg": "Crossgen " - }, - "ReportingParameters": { - "OperatingSystem": "Windows", - "Architecture": "arm64", - "SubType": "Build-Tests-R2R", - "Type": "build/product/", - "PB_BuildType": "Release" - } - }, - { - "Name": "Dotnet-CoreClr-Trusted-BuildTests", - "Parameters": { - "HelixJobType": "test/functional/cli/", - "TargetsWindows": "false", - "Rid": "osx-x64", - "TargetQueues": "osx.1012.amd64,osx.1013.amd64", - "TestContainerSuffix": "osx", - "TargetsNonWindowsArg": "TargetsNonWindows " - }, - "ReportingParameters": { - "OperatingSystem": "OSX", - "SubType": "Build-Tests", - "Type": "build/product/", - "PB_BuildType": "Release" - } - }, - { - "Name": "Dotnet-CoreClr-Trusted-BuildTests", - "Parameters": { - "HelixJobType": "test/functional/r2r/cli/", - "TargetsWindows": "false", - "Rid": "osx-x64", - "TargetQueues": "osx.1012.amd64,osx.1013.amd64", - "TestContainerSuffix": "osx-r2r", - "CrossgenArg": "Crossgen ", - "TargetsNonWindowsArg": "TargetsNonWindows " - }, - "ReportingParameters": { - "OperatingSystem": "OSX", - "SubType": "Build-Tests-R2R", - "Type": "build/product/", - "PB_BuildType": "Release" - } - }, - { - "Name": "Dotnet-CoreClr-Trusted-BuildTests", - "Parameters": { - "HelixJobType": "test/functional/cli/", - "TargetsWindows": "false", - "Rid": "linux-x64", - "TargetQueues": "debian.82.amd64,fedora.26.amd64,fedora.27.amd64,redhat.73.amd64,ubuntu.1404.amd64,ubuntu.1604.amd64,ubuntu.1710.amd64,ubuntu.1804.amd64,opensuse.423.amd64,sles.12.amd64", - "TestContainerSuffix": "linux", - "TargetsNonWindowsArg": "TargetsNonWindows " - }, - "ReportingParameters": { - "OperatingSystem": "RedHat 7", - "SubType": "Build-Tests", - "Type": "build/product/", - "PB_BuildType": "Release" - } - }, - { - "Name": "Dotnet-CoreClr-Trusted-BuildTests", - "Parameters": { - "HelixJobType": "test/functional/r2r/cli/", - "TargetsWindows": "false", - "Rid": "linux-x64", - "TargetQueues": "debian.82.amd64,fedora.26.amd64,fedora.27.amd64,redhat.73.amd64,ubuntu.1404.amd64,ubuntu.1604.amd64,ubuntu.1710.amd64,ubuntu.1804.amd64,opensuse.423.amd64,sles.12.amd64", - "TestContainerSuffix": "linux-r2r", - "CrossgenArg": "Crossgen ", - "TargetsNonWindowsArg": "TargetsNonWindows " - }, - "ReportingParameters": { - "OperatingSystem": "RedHat 7", - "SubType": "Build-Tests-R2R", - "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" - ] } ] } diff --git a/buildpipeline/tests/test_pipelines.json b/buildpipeline/tests/test_pipelines.json index b4f1ed905b..cd93561a92 100644 --- a/buildpipeline/tests/test_pipelines.json +++ b/buildpipeline/tests/test_pipelines.json @@ -92,7 +92,7 @@ "HelixJobType": "test/functional/cli/", "TargetsWindows": "false", "Rid": "osx-x64", - "TargetQueues": "osx.1012.amd64", + "TargetQueues": "osx.1012.amd64,osx.1013.amd64", "TestContainerSuffix": "osx", "TargetsNonWindowsArg": "TargetsNonWindows " }, @@ -109,7 +109,7 @@ "HelixJobType": "test/functional/r2r/cli/", "TargetsWindows": "false", "Rid": "osx-x64", - "TargetQueues": "osx.1012.amd64", + "TargetQueues": "osx.1012.amd64,osx.1013.amd64", "TestContainerSuffix": "osx-r2r", "CrossgenArg": "Crossgen ", "TargetsNonWindowsArg": "TargetsNonWindows " @@ -127,7 +127,7 @@ "HelixJobType": "test/functional/cli/", "TargetsWindows": "false", "Rid": "linux-x64", - "TargetQueues": "debian.82.amd64,fedora.25.amd64,redhat.72.amd64,ubuntu.1404.amd64,ubuntu.1604.amd64,ubuntu.1710.amd64", + "TargetQueues": "debian.82.amd64,fedora.26.amd64,fedora.27.amd64,redhat.73.amd64,ubuntu.1404.amd64,ubuntu.1604.amd64,ubuntu.1710.amd64,ubuntu.1804.amd64,opensuse.423.amd64,sles.12.amd64", "TestContainerSuffix": "linux", "TargetsNonWindowsArg": "TargetsNonWindows " }, @@ -144,7 +144,7 @@ "HelixJobType": "test/functional/r2r/cli/", "TargetsWindows": "false", "Rid": "linux-x64", - "TargetQueues": "debian.82.amd64,fedora.25.amd64,redhat.72.amd64,ubuntu.1404.amd64,ubuntu.1604.amd64,ubuntu.1710.amd64", + "TargetQueues": "debian.82.amd64,fedora.26.amd64,fedora.27.amd64,redhat.73.amd64,ubuntu.1404.amd64,ubuntu.1604.amd64,ubuntu.1710.amd64,ubuntu.1804.amd64,opensuse.423.amd64,sles.12.amd64", "TestContainerSuffix": "linux-r2r", "CrossgenArg": "Crossgen ", "TargetsNonWindowsArg": "TargetsNonWindows " |