From 2c3ec468a3719b0f4cb33a10a45458e748ebf2bf Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Fri, 21 May 2021 17:46:08 -0700
Subject: [PATCH 1/2] [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'
---
eng/targets/Helix.Common.props | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index 8ea26294a254..0e19c7ae8a75 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -18,23 +18,22 @@
-
-
+
+
-
-
+
-
+
-
+
+
From 87a65e57e35372a44ea7f56c5180e5c4cb47053f Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 26 May 2021 14:10:15 -0700
Subject: [PATCH 2/2] Remove queue additions - don't add OSX 11.00 or Ubuntu
20.04 queues - leave Ubuntu 16.04 removal - also use Ubuntu 18.04 base for
Debian 9 ARM64 testing - leave OSX 10.13 -> 10.14 and Fedora 28 -> 33
upgrades
nit: remove old commented-out mention of Alpine.38.Arm64
---
eng/targets/Helix.Common.props | 7 -------
1 file changed, 7 deletions(-)
diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index 0e19c7ae8a75..b34614dc6fb5 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -19,9 +19,7 @@
-
-
@@ -29,12 +27,7 @@
-
-
-