Skip to content

Commit 2c3ec46

Browse files
committed
[release/3.1] Clean out Ubuntu 16.04 testing
- a variant of #32894 - use Ubuntu 18.04 agents for testing in Docker containers on Helix - remove use of old Centos and Debian queues - move to newer OSX.1014.Amd64.Open queue and Fedora.33.Amd64.Open Docker image - add a couple of queues we test against in 'main'
1 parent 8e330aa commit 2c3ec46

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

eng/targets/Helix.Common.props

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,22 @@
1818
<HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
1919
<HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" />
2020
<HelixAvailableTargetQueue Include="Windows.10.Amd64.EnterpriseRS3.ASPNET.Open" Platform="Windows" EnableByDefault="false" />
21-
<HelixAvailableTargetQueue Include="OSX.1013.Amd64.Open" Platform="OSX" />
22-
<HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
21+
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="OSX" />
22+
<HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="OSX" />
2323
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
24-
<HelixAvailableTargetQueue Include="Centos.7.Amd64.Open" Platform="Linux" />
25-
<HelixAvailableTargetQueue Include="Debian.8.Amd64.Open" Platform="Linux" />
24+
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
2625
<HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
2726
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
28-
<HelixAvailableTargetQueue Include="(Fedora.28.Amd64.Open)Ubuntu.1604[email protected]/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249" Platform="Linux" />
27+
<HelixAvailableTargetQueue Include="(Fedora.33.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267" Platform="Linux" />
2928
</ItemGroup>
3029

3130
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true' AND '$(TargetArchitecture)' == 'arm64'">
3231
<!-- arm64 queues -->
33-
<HelixAvailableTargetQueue Include="(Debian.9.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-a12566d-20190807161036" Platform="Linux" />
32+
<HelixAvailableTargetQueue Include="Ubuntu.1804.ArmArch.Open" Platform="Linux" />
33+
<HelixAvailableTargetQueue Include="(Debian.9.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-a12566d-20190807161036" Platform="Linux" />
3434

3535
<!-- Need to resolve permission issues on this docker queue
36-
<HelixAvailableTargetQueue Include="(Alpine.38.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-46e69dd-20190327215724" Platform="Linux" />
37-
<HelixAvailableTargetQueue Include="(Ubuntu-1804.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-6f28fa9-20190606004102" Platform="Linux" />
36+
<HelixAvailableTargetQueue Include="(Alpine.38.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-46e69dd-20190327215724" Platform="Linux" />
3837
-->
3938
</ItemGroup>
4039

0 commit comments

Comments
 (0)