Skip to content

Commit dde3959

Browse files
authored
[release/6.0] Stop building / testing on Ubuntu 18.04 (#43947)
- use 20.04 instead
1 parent d5b20ec commit dde3959

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

.azure/pipelines/jobs/default-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
vmImage: macOS-11
9898
${{ if eq(parameters.agentOs, 'Linux') }}:
9999
${{ if and(eq(parameters.useHostedUbuntu, true), or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
100-
vmImage: ubuntu-18.04
100+
vmImage: ubuntu-20.04
101101
${{ if or(eq(parameters.useHostedUbuntu, false), and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
102102
${{ if eq(variables['System.TeamProject'], 'public') }}:
103103
name: NetCore-Svc-Public

eng/scripts/RunHelix.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
Debian.11.Amd64.Open
1212
Mariner
1313
Redhat.7.Amd64.Open
14-
Ubuntu.1804.Amd64.Open
1514
Ubuntu.2004.Amd64.Open
16-
OSX.1015.Amd64.Open
1715
OSX.1100.Amd64.Open
1816
Windows.10.Amd64.Server20H2.Open
1917
Windows.11.Amd64.Client.Open

eng/targets/Helix.Common.props

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<!-- this file is shared between Helix.proj and .csproj files -->
33
<PropertyGroup>
4-
<HelixQueueAlpine314>(Alpine.314.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19</HelixQueueAlpine314>
5-
<HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64-20211001171307-0ece9b3</HelixQueueDebian11>
6-
<HelixQueueFedora34>(Fedora.34.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:fedora-34-helix-20210924174119-4f64125</HelixQueueFedora34>
7-
<HelixQueueMariner>(Mariner)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620</HelixQueueMariner>
8-
<HelixQueueArmDebian11>(Debian.11.Arm64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20211001171229-97d8652</HelixQueueArmDebian11>
4+
<HelixQueueAlpine314>(Alpine.314.Amd64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64-20210910135833-1848e19</HelixQueueAlpine314>
5+
<HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64-20211001171307-0ece9b3</HelixQueueDebian11>
6+
<HelixQueueFedora34>(Fedora.34.Amd64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:fedora-34-helix-20210924174119-4f64125</HelixQueueFedora34>
7+
<HelixQueueMariner>(Mariner)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix-20210528192219-92bf620</HelixQueueMariner>
8+
<HelixQueueArmDebian11>(Debian.11.Arm64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20211001171229-97d8652</HelixQueueArmDebian11>
99
</PropertyGroup>
1010

1111
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true'">
@@ -20,7 +20,7 @@
2020

2121
<!-- x64 PR(ci.yaml) required queues for internal and public cases -->
2222
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' != 'true'">
23-
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
23+
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
2424
<HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
2525
<HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="OSX" />
2626
</ItemGroup>
@@ -29,7 +29,6 @@
2929
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
3030
<!-- Linux -->
3131
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
32-
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
3332

3433
<!-- Mac -->
3534
<HelixAvailableTargetQueue Include="OSX.1015.Amd64.Open" Platform="OSX" />

0 commit comments

Comments
 (0)