Skip to content

Commit 45d2c24

Browse files
mmitchedougbu
andauthored
Fixes for internal runtime usage in build and PRs (#35133)
* Fixes for internal runtime usage in build and PRs - Don't conditionalize queue adds based on use of open queues. In eng/targets/Helix.targets, these are replaced with the non-open versions automatically - Don't use default error detection for the repo tasks build in source build, as this may pick up the error messages from the first attempts to install an internal runtime from a public location (it later succeeds using the private location.) * Revert _UseOpenHelixQueues != 'true' for VS2019 Preview queues. * Avoid running non-preview queues on internal daily test * Sort * Add some more comments * Update eng/targets/Helix.Common.props Co-authored-by: Doug Bunting <[email protected]> * Update eng/SourceBuild.props Co-authored-by: Doug Bunting <[email protected]> * Update eng/targets/Helix.Common.props Co-authored-by: Doug Bunting <[email protected]> Co-authored-by: Doug Bunting <[email protected]>
1 parent 02f5374 commit 45d2c24

File tree

2 files changed

+36
-10
lines changed

2 files changed

+36
-10
lines changed

eng/SourceBuild.props

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,20 @@
4646
Condition="'$(ArcadeInnerBuildFromSource)' == 'true'"
4747
BeforeTargets="Execute">
4848

49+
<!-- If the alternative runtime location and key are present, pass those through -->
50+
<PropertyGroup>
51+
<_AdditionalRepoTaskBuildArgs />
52+
<_AdditionalRepoTaskBuildArgs Condition="'$(DotNetRuntimeSourceFeed)' != ''" >$(_AdditionalRepoTaskBuildArgs) --runtimesourcefeed $(DotNetRuntimeSourceFeed)</_AdditionalRepoTaskBuildArgs>
53+
<_AdditionalRepoTaskBuildArgs Condition="'$(DotNetRuntimeSourceFeedKey)' != ''" >$(_AdditionalRepoTaskBuildArgs) --runtimesourcefeedkey $(DotNetRuntimeSourceFeedKey)</_AdditionalRepoTaskBuildArgs>
54+
</PropertyGroup>
55+
56+
<!-- Call the build.sh script to build the repo tasks. Set IgnoreStandardErrorWarningFormat
57+
to true. This avoids fatal errors, because in internal builds there are usually a few failed installation
58+
attempts as the install script walks through potential locations for a runtime.
59+
The overall build script will return a proper exit code, but we don't want to pick up the printed error messages. -->
4960
<Exec
50-
Command="./eng/build.sh --only-build-repo-tasks -bl"
61+
Command="./eng/build.sh --only-build-repo-tasks -bl $(_AdditionalRepoTaskBuildArgs)"
62+
IgnoreStandardErrorWarningFormat="true"
5163
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
5264
EnvironmentVariables="@(InnerBuildEnv)" />
5365
</Target>

eng/targets/Helix.Common.props

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,55 @@
1010
<HelixAvailablePlatform Include="Windows" />
1111
</ItemGroup>
1212

13-
<!-- PR(ci.yaml) required queues -->
14-
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(_UseHelixOpenQueues)' == 'true'">
13+
<!-- x64 PR(ci.yaml) required queues for internal and public cases -->
14+
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' != 'true'">
1515
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
1616
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" />
1717
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="OSX" />
1818
</ItemGroup>
1919

20-
<!-- Quarantined test queues -->
20+
<!-- x64 Quarantined-only (quarantined-pr.yml and quarantined-tests.yml) test queues -->
2121
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(RunQuarantinedTests)' == 'true'">
22-
<HelixAvailableTargetQueue Include="(Fedora.34.Amd64.Open)ubuntu.1604[email protected]/dotnet-buildtools/prereqs:fedora-34-helix-20210728124700-4f64125" Platform="Linux" />
22+
<HelixAvailableTargetQueue Include="(Fedora.34.Amd64.Open)ubuntu.1804[email protected]/dotnet-buildtools/prereqs:fedora-34-helix-20210728124700-4f64125" Platform="Linux" />
2323
</ItemGroup>
2424

25-
<!-- queues for helix-matrix.yml pipeline -->
25+
<!-- x64 Queues for public helix-matrix.yml and quarantine pipelines, except in windows-only cases -->
2626
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
27-
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
28-
<HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="OSX" />
27+
<!-- Linux -->
2928
<HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
3029
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
31-
<HelixAvailableTargetQueue Include="(Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix-20210728124700-4f64125" Platform="Linux" />
30+
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
31+
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
32+
33+
<!-- Mac -->
34+
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="OSX" />
35+
<HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="OSX" />
36+
37+
<!-- Containers -->
38+
<HelixAvailableTargetQueue Include="(Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix-20210728124700-4f64125" Platform="Linux" />
3239
<HelixAvailableTargetQueue Include="(Alpine.312.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673" Platform="Linux" />
3340
<HelixAvailableTargetQueue Include="(Mariner)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620" Platform="Linux" />
3441
</ItemGroup>
42+
43+
<!-- x64 Queues for public helix-matrix.yml and quarantine pipelines, Windows cases-->
3544
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true'">
45+
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" />
3646
<!-- TODO Re-enable Win-7 queue when dotnet restore are fixed. https://github.com/dotnet/aspnetcore/issues/32683 -->
3747
<!-- <HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" /> -->
3848
<HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
3949
</ItemGroup>
50+
51+
<!-- x64 Queues for internal helix-matrix.yml and quarantine pipelines -->
52+
<!-- The preview queue is only available internally, and should only be run on a daily basis -->
4053
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' != 'true'">
4154
<HelixAvailableTargetQueue Include="Windows.10.Amd64.ClientPre.VS2019.Pre" Platform="Windows" />
4255
</ItemGroup>
4356

44-
<!-- arm64 queues for helix-matrix.yml pipeline -->
57+
<!-- arm64 queues for helix-matrix.yml and quarantine pipeline -->
4558
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
4659
<HelixAvailableTargetQueue Include="(Debian.9.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-a12566d-20190807161036" Platform="Linux" />
4760
</ItemGroup>
61+
4862
<!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on it's setup scripts. -->
4963
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
5064
<HelixAvailableTargetQueue Include="Windows.10.Arm64v8.Open" Platform="Windows" />

0 commit comments

Comments
 (0)