Fix offical Alpine build - sync arguments (dotnet/corefx#24884)
authorJan Vorlicek <janvorli@microsoft.com>
Thu, 26 Oct 2017 10:32:42 +0000 (12:32 +0200)
committerGitHub <noreply@github.com>
Thu, 26 Oct 2017 10:32:42 +0000 (12:32 +0200)
* Fix offical Alpine build - sync arguments

It turns out that the sync.sh command needs to be passed the -SkipTests
option too so that it doesn't try to sync core-setup packages that
are used only for running tests. Since there are no core-setup packages
for Alpine yet, the sync was failing.
I have also noticed that there was a recent change in the sync arguments
that I have not discovered after rebase of my changes to master. So I
have added the new option there.

* Replace SkipTests with BuildTests=false

I have realized that the build.sh and sync.sh command should be getting
-BuildTests=false instead of the -SkipTests to fix the problem.

Commit migrated from https://github.com/dotnet/corefx/commit/3f0bd5d8c3d019ad8b1561395030a58bc38ddfe9

src/libraries/buildpipeline/pipeline.json

index 2c02f8f..90103f7 100644 (file)
@@ -52,9 +52,9 @@
           "Name": "DotNet-CoreFx-Trusted-Linux",
           "Parameters": {
             "PB_DockerTag": "alpine-3.6-3148f11-20171119021156",
-            "PB_BuildArguments": "-buildArch=x64 -Release -stripSymbols -RuntimeOS=alpine.3.6 -- /p:PortableBuild=false",
+            "PB_BuildArguments": "-buildArch=x64 -Release -BuildTests=false -stripSymbols -RuntimeOS=alpine.3.6 -- /p:PortableBuild=false",
             "PB_BuildTestsArguments": "-buildArch=x64 -Release -SkipTests -Outerloop -RuntimeOS=alpine.3.6 -- /p:ArchiveTests=false /p:EnableDumpling=true /p:PortableBuild=false",
-            "PB_SyncArguments": "-p -RuntimeOS=alpine.3.6 -- /p:ArchGroup=x64 /p:PortableBuild=false",
+            "PB_SyncArguments": "-p -BuildTests=false -RuntimeOS=alpine.3.6 -- /p:ArchGroup=x64 /p:PortableBuild=false /p:OverridePackageSource=$(PB_AzureFeedUrl)",
             "PB_TargetQueue": "Alpine.36.Amd64",
             "PB_EnableCloudTest" : "false",
             "PB_CreateHelixArguments": "/p:EnableCloudTest=$(PB_EnableCloudTest) /p:ArchGroup=x64 /p:ConfigurationGroup=Release /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Linux"
           "Name": "DotNet-CoreFx-Trusted-Linux",
           "Parameters": {
             "PB_DockerTag": "alpine-3.6-3148f11-20171119021156",
-            "PB_BuildArguments": "-buildArch=x64 -Debug -RuntimeOS=alpine.3.6 -- /p:PortableBuild=false",
+            "PB_BuildArguments": "-buildArch=x64 -Debug -BuildTests=false -RuntimeOS=alpine.3.6 -- /p:PortableBuild=false",
             "PB_BuildTestsArguments": "-buildArch=x64 -Debug -SkipTests -Outerloop -RuntimeOS=alpine.3.6 -- /p:ArchiveTests=false /p:EnableDumpling=true /p:PortableBuild=false",
-            "PB_SyncArguments": "-p -RuntimeOS=alpine.3.6 -- /p:ArchGroup=x64 /p:PortableBuild=false",
+            "PB_SyncArguments": "-p -BuildTests=false -RuntimeOS=alpine.3.6 -- /p:ArchGroup=x64 /p:PortableBuild=false /p:OverridePackageSource=$(PB_AzureFeedUrl)",
             "PB_TargetQueue": "Alpine.36.Amd64",
             "PB_EnableCloudTest" : "false",
             "PB_CreateHelixArguments": "/p:EnableCloudTest=$(PB_EnableCloudTest) /p:ArchGroup=x64 /p:ConfigurationGroup=Debug /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Linux"