From a6e80cad47eb040713cc0338e55ca4692aef4bbf Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 13 Jun 2019 10:42:18 -0700 Subject: [PATCH 1/4] [release/2.1] Update to test on Alpine3.9 instead of Alpine3.6 (#38404) * Update to test on Alpine3.9 instead of Alpine3.6 * Update docker images to point to MCR * Fix typo * Update to new Alpine images * Only test on Alpine --- buildpipeline/pipeline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index 506c3ad1ec10..971e8b351b66 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -55,7 +55,7 @@ "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -stripSymbols -RuntimeOS=linux-musl -- /p:PortableBuild=false /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_BuildTestsArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -RuntimeOS=linux-musl -- /p:ArchiveTests=true /p:EnableDumpling=true /p:PortableBuild=false", "PB_SyncArguments": "-p -BuildTests=false -RuntimeOS=linux-musl -- /p:ArchGroup=x64 /p:PortableBuild=false /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", - "PB_TargetQueue": "Alpine.36.Amd64", + "PB_TargetQueue": "Alpine.39.Amd64.Open-x64", "PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Linux" }, "ReportingParameters": { From 3963c9c427e236eaf79ce74cbfa26097e73fce05 Mon Sep 17 00:00:00 2001 From: Matt Galbraith Date: Mon, 17 Jun 2019 09:27:21 -0700 Subject: [PATCH 2/4] Fix Alpine 3.9 queue to docker-ized version. --- buildpipeline/pipeline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index 971e8b351b66..7cefd427419f 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -55,7 +55,7 @@ "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -stripSymbols -RuntimeOS=linux-musl -- /p:PortableBuild=false /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_BuildTestsArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -RuntimeOS=linux-musl -- /p:ArchiveTests=true /p:EnableDumpling=true /p:PortableBuild=false", "PB_SyncArguments": "-p -BuildTests=false -RuntimeOS=linux-musl -- /p:ArchGroup=x64 /p:PortableBuild=false /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", - "PB_TargetQueue": "Alpine.39.Amd64.Open-x64", + "PB_TargetQueue": "(Alpine.39.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-helix-09ca40b-20190508143246", "PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Linux" }, "ReportingParameters": { From 5c11b0d090ec43aa9214bc329be40e0f2052b129 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 17 Jun 2019 13:48:16 -0700 Subject: [PATCH 3/4] Ensure .azure-ci.yml file gets deleted (#38617) --- buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json | 2 +- buildpipeline/DotNet-CoreFx-Trusted-Linux.json | 2 +- buildpipeline/DotNet-CoreFx-Trusted-OSX.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json b/buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json index 639b6a6807c0..16047c870290 100644 --- a/buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json +++ b/buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json @@ -56,7 +56,7 @@ }, "inputs": { "SourceFolder": "$(PB_GitDirectory)", - "Contents": "**\n.gitignore\n.editorconfig\n.gitattributes\n.gitmirrorall\n.git/**\n.git" + "Contents": "**\n.gitignore\n.editorconfig\n.gitattributes\n.gitmirrorall\n.git/**\n.git\n.azure-ci.yml" } }, { diff --git a/buildpipeline/DotNet-CoreFx-Trusted-Linux.json b/buildpipeline/DotNet-CoreFx-Trusted-Linux.json index f0a742e390ed..0f1a1f86b16c 100644 --- a/buildpipeline/DotNet-CoreFx-Trusted-Linux.json +++ b/buildpipeline/DotNet-CoreFx-Trusted-Linux.json @@ -56,7 +56,7 @@ }, "inputs": { "SourceFolder": "$(PB_GitDirectory)", - "Contents": "**\n.gitignore\n.editorconfig\n.gitattributes\n.gitmirrorall\n.git/**\n.git" + "Contents": "**\n.gitignore\n.editorconfig\n.gitattributes\n.gitmirrorall\n.git/**\n.git\n.azure-ci.yml" } }, { diff --git a/buildpipeline/DotNet-CoreFx-Trusted-OSX.json b/buildpipeline/DotNet-CoreFx-Trusted-OSX.json index bb8150136e08..ad3cbe4edb66 100644 --- a/buildpipeline/DotNet-CoreFx-Trusted-OSX.json +++ b/buildpipeline/DotNet-CoreFx-Trusted-OSX.json @@ -36,7 +36,7 @@ }, "inputs": { "SourceFolder": "$(Agent.BuildDirectory)/s", - "Contents": "**\n.gitignore" + "Contents": "**\n.gitignore\n.editorconfig\n.gitattributes\n.gitmirrorall\n.git/**\n.git\n.azure-ci.yml" } }, { From a56b82ec2c9fd7e4344465f4f1640b13ec61b694 Mon Sep 17 00:00:00 2001 From: Matt Galbraith Date: Tue, 18 Jun 2019 08:50:04 -0700 Subject: [PATCH 4/4] Change to internal Helix queue I fixed one part but not the other (.Open no longer allow anonymous access) --- buildpipeline/pipeline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index 7cefd427419f..c40f467b7a7f 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -55,7 +55,7 @@ "PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -stripSymbols -RuntimeOS=linux-musl -- /p:PortableBuild=false /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)", "PB_BuildTestsArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -RuntimeOS=linux-musl -- /p:ArchiveTests=true /p:EnableDumpling=true /p:PortableBuild=false", "PB_SyncArguments": "-p -BuildTests=false -RuntimeOS=linux-musl -- /p:ArchGroup=x64 /p:PortableBuild=false /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)", - "PB_TargetQueue": "(Alpine.39.Amd64.Open)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-helix-09ca40b-20190508143246", + "PB_TargetQueue": "(Alpine.39.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-helix-09ca40b-20190508143246", "PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Linux" }, "ReportingParameters": {