Skip to content

Commit a6a5130

Browse files
committed
Clean out @(HelixAvailableTargetQueue) items too
1 parent 3f06c61 commit a6a5130

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

eng/targets/Helix.Common.props

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,39 @@
1313

1414
<!-- PR(ci.yaml) required queues -->
1515
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(_UseHelixOpenQueues)' == 'true'">
16-
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
17-
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" />
16+
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" Condition=" '$(TargetOsName)' == 'linux' " />
17+
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" Condition=" '$(TargetOsName)' == 'win' " />
1818
</ItemGroup>
1919

2020
<!-- queues for helix-matrix.yml pipeline -->
21-
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
21+
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND
22+
'$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true' AND '$(TargetOsName)' == 'linux' ">
2223
<HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
2324
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
2425
<HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
2526
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
2627
<HelixAvailableTargetQueue Include="(Fedora.33.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267" Platform="Linux" />
2728
<HelixAvailableTargetQueue Include="(Alpine.312.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673" Platform="Linux" />
2829
</ItemGroup>
29-
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true'">
30+
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND
31+
'$(_UseHelixOpenQueues)' == 'true' AND '$(TargetOsName)' == 'win' ">
3032
<!-- TODO Re-enable Win-7 queue when dotnet restore are fixed. https://github.com/dotnet/aspnetcore/issues/32683 -->
3133
<!-- <HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" /> -->
3234
<HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
3335
</ItemGroup>
34-
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' != 'true'">
36+
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND
37+
'$(_UseHelixOpenQueues)' != 'true' AND '$(TargetOsName)' == 'win' ">
3538
<HelixAvailableTargetQueue Include="Windows.10.Amd64.ClientPre.VS2019.Pre" Platform="Windows" />
3639
</ItemGroup>
3740

3841
<!-- arm64 queues for helix-matrix.yml pipeline -->
39-
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
42+
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND
43+
'$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true' AND '$(TargetOsName)' == 'linux' ">
4044
<HelixAvailableTargetQueue Include="(Debian.9.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-a12566d-20190807161036" Platform="Linux" />
4145
</ItemGroup>
4246
<!-- IIS Express isn't supported on arm64 and most of the IsWindowsOnlyTests depend on it's setup scripts. -->
43-
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
47+
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND
48+
'$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true' AND '$(TargetOsName)' == 'win' ">
4449
<HelixAvailableTargetQueue Include="Windows.10.Arm64v8.Open" Platform="Windows" />
4550
</ItemGroup>
4651
</Project>

0 commit comments

Comments
 (0)