From 996376eef179f99000e935ecf403abdb3dab9b7c Mon Sep 17 00:00:00 2001 From: Matt Galbraith Date: Wed, 31 Jan 2018 15:26:41 -0800 Subject: [PATCH] Some cleanups for test execution, in preparation of removing support for running on EOL Linux OSes. Removals: Fedora 25 - EOL 12/20/17 OpenSUSE 42.2 - EOL 01/26/18 RedHat 7.2 - EOL 11/30/17 Additions: OpenSUSE 42.3 Fedora 27 Commit migrated from https://github.com/dotnet/corefx/commit/3de89a70a1ac81d420543604cf1956818abbe7e8 --- src/libraries/buildpipeline/DotNet-CoreFx-Trusted-Linux.json | 2 +- src/libraries/buildpipeline/linux.groovy | 6 +++--- src/libraries/buildpipeline/pipeline.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libraries/buildpipeline/DotNet-CoreFx-Trusted-Linux.json b/src/libraries/buildpipeline/DotNet-CoreFx-Trusted-Linux.json index 6619b25..1b17afc 100644 --- a/src/libraries/buildpipeline/DotNet-CoreFx-Trusted-Linux.json +++ b/src/libraries/buildpipeline/DotNet-CoreFx-Trusted-Linux.json @@ -457,7 +457,7 @@ "allowOverride": true }, "PB_TargetQueue": { - "value": "Centos.73.Amd64+RedHat.72.Amd64+RedHat.73.Amd64+Debian.87.Amd64+Debian.90.Amd64+Ubuntu.1404.Amd64+Ubuntu.1604.Amd64+suse.422.amd64+SLES.12.Amd64+fedora.25.amd64+Fedora.26.Amd64" + "value": "Centos.73.Amd64+RedHat.73.Amd64+Debian.87.Amd64+Debian.90.Amd64+Ubuntu.1404.Amd64+Ubuntu.1604.Amd64+opensuse.423.amd64+SLES.12.Amd64+Fedora.26.Amd64+Fedora.27.Amd64" }, "PB_VsoAccountName": { "value": "dn-bot" diff --git a/src/libraries/buildpipeline/linux.groovy b/src/libraries/buildpipeline/linux.groovy index c510d48..e6c761a 100644 --- a/src/libraries/buildpipeline/linux.groovy +++ b/src/libraries/buildpipeline/linux.groovy @@ -52,11 +52,11 @@ simpleDockerNode('microsoft/dotnet-buildtools-prereqs:rhel7_prereqs_2') { 'Debian.87.Amd64.Open', 'Ubuntu.1404.Amd64.Open', 'Ubuntu.1604.Amd64.Open', - 'opensuse.422.amd64.open', - 'fedora.25.amd64.Open',] + 'OpenSuse.423.Amd64.Open', + 'Fedora.26.Amd64.Open',] if (params.TestOuter) { targetHelixQueues += ['Debian.90.Amd64.Open', - 'Fedora.26.Amd64.Open', + 'Fedora.27.Amd64.Open', 'SLES.12.Amd64.Open',] } diff --git a/src/libraries/buildpipeline/pipeline.json b/src/libraries/buildpipeline/pipeline.json index 31ff8ec..c70cd58 100644 --- a/src/libraries/buildpipeline/pipeline.json +++ b/src/libraries/buildpipeline/pipeline.json @@ -18,7 +18,7 @@ "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -stripSymbols", "PB_BuildTestsArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:ArchiveTests=true /p:EnableDumpling=true", "PB_SyncArguments": "-p -- /p:ArchGroup=x64 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", - "PB_TargetQueue": "Centos.73.Amd64+RedHat.72.Amd64+RedHat.73.Amd64+Debian.87.Amd64+Debian.90.Amd64+Ubuntu.1404.Amd64+Ubuntu.1604.Amd64+Ubuntu.1710.Amd64+suse.422.amd64+SLES.12.Amd64+fedora.25.amd64+Fedora.26.Amd64", + "PB_TargetQueue": "Centos.73.Amd64+RedHat.73.Amd64+Debian.87.Amd64+Debian.90.Amd64+Ubuntu.1404.Amd64+Ubuntu.1604.Amd64+Ubuntu.1710.Amd64+OpenSuse.423.Amd64+SLES.12.Amd64+Fedora.26.Amd64+Fedora.27.Amd64", "PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Linux" }, "ReportingParameters": { -- 2.7.4