Skip to content

Commit ad5965c

Browse files
committed
Use Ubuntu 18.04 1ES pools and dotnet-buildtools-prereq docker images for enterprise linux pipeline
Ubuntu 16.04 is no longer available on Azure Pipelines, move to 18.04 on 1ES pool and the Docker images from dotnet-buildtools-prereq.
1 parent d14c2ed commit ad5965c

File tree

2 files changed

+4
-22
lines changed
  • eng/pipelines/libraries/enterprise
  • src/libraries/Common/tests/System/Net/EnterpriseTests/setup/linuxclient

2 files changed

+4
-22
lines changed

eng/pipelines/libraries/enterprise/linux.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ pr:
1919
- src/libraries/System.Net.Security/*
2020

2121
pool:
22-
vmImage: 'ubuntu-16.04'
22+
name: NetCore1ESPool-Public
23+
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
2324

2425
variables:
2526
- template: ../variables.yml

src/libraries/Common/tests/System/Net/EnterpriseTests/setup/linuxclient/Dockerfile

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,12 @@
1-
# Switch to mcr.microsoft.com/dotnet-buildtools/prereqs ubuntu 18.04 images when they are fixed
2-
FROM ubuntu:18.04
1+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20211022152710-047508b
32

43
# Prevents dialog prompting when installing packages
54
ARG DEBIAN_FRONTEND=noninteractive
65

7-
# This 'RUN' step can be removed once dotnet-buildtools/prereqs image is fixed
8-
#
9-
# Makes the image capable of building and running tests in dotnet-runtime repo.
10-
# Add retries to apt-get since the ubuntu package servers have had errors lately such as:
11-
# "E: Failed to fetch http://archive.ubuntu.com/ubuntu/pool/main/p/publicsuffix/publicsuffix_20180223.1310-1_all.deb Undetermined Error [IP: 91.189.88.31 80]"
12-
ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
13-
RUN echo "APT::Acquire::Retries \"10\";" > /etc/apt/apt.conf.d/80-retries && \
14-
apt-get update && \
15-
apt-get install -y --no-install-recommends apt-transport-https ca-certificates gnupg software-properties-common wget && \
16-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add - && \
17-
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \
18-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | apt-key add - && \
19-
apt-add-repository 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main' && \
20-
apt-get update && \
21-
apt-get install -y --no-install-recommends cmake llvm-9 clang-9 lldb-6.0 liblldb-6.0-dev libunwind8 libunwind-dev gettext libicu-dev liblttng-ust-dev libssl-dev libnuma-dev libkrb5-dev locales && \
22-
locale-gen en_US.UTF-8 && \
23-
update-locale LANG=en_US.UTF-8
24-
256
# Install Kerberos, NTLM, and diagnostic tools
267
COPY ./common/krb5.conf /etc/krb5.conf
278
RUN apt-get update && \
28-
apt-get install -y --no-install-recommends krb5-user gss-ntlmssp iputils-ping dnsutils nano curl
9+
apt-get install -y --no-install-recommends krb5-user gss-ntlmssp iputils-ping dnsutils nano
2910

3011
# Set environment variable to turn on enterprise tests
3112
ENV DOTNET_RUNTIME_ENTERPRISETESTS_ENABLED 1

0 commit comments

Comments
 (0)