Adding an ARM64 lane, running on docker in a private pool (#20849)

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>

5 files changed, 23 insertions, 2 deletions

diff --git a/external/corefx b/external/corefx
-Subproject 7c24bb0756fd39fbf09b8777f25c15d21d78eb4
+Subproject f57dab4729377040840c42723debe0be34bc48c
diff --git a/mcs/class/System/Test/System.Net.Sockets/UdpClientTest.cs b/mcs/class/System/Test/System.Net.Sockets/UdpClientTest.cs
index c2d73619ca5..219f05c704e 100644
--- a/mcs/class/System/Test/System.Net.Sockets/UdpClientTest.cs
+++ b/mcs/class/System/Test/System.Net.Sockets/UdpClientTest.cs
@@ -661,6 +661,9 @@ namespace MonoTests.System.Net.Sockets {
 #endif
 		public void JoinMulticastGroup2_Socket_NotBound ()
 		{
+			if (!Socket.OSSupportsIPv6)
+				Assert.Ignore ("IPv6 not enabled.");
+
 			IPAddress mcast_addr = IPAddress.Parse ("ff02::1");
 
 			using (UdpClient client = new UdpClient (AddressFamily.InterNetworkV6)) {
diff --git a/mcs/class/System/Test/System.Net/DnsTest.cs b/mcs/class/System/Test/System.Net/DnsTest.cs
index 7954f8b5bb5..2a4480066a5 100644
--- a/mcs/class/System/Test/System.Net/DnsTest.cs
+++ b/mcs/class/System/Test/System.Net/DnsTest.cs
@@ -212,6 +212,9 @@ namespace MonoTests.System.Net
 		[Category("NotOnWindows")]

 		public void GetHostAddresses_IPv6 ()

 		{

+			if (!Socket.OSSupportsIPv6)

+				Assert.Ignore ("OS does not support IPv6.");

+

 			var address = Dns.GetHostAddresses("ipv6.google.com");

 		}

 

diff --git a/scripts/ci/mono-ci-job-template.yml b/scripts/ci/mono-ci-job-template.yml
index 66a8c5c8846..12e215fbb48 100644
--- a/scripts/ci/mono-ci-job-template.yml
+++ b/scripts/ci/mono-ci-job-template.yml
@@ -24,12 +24,18 @@ jobs:
   pool:
     ${{ if eq(parameters.os, 'osx') }}:
       vmImage: macos-10.15
-    ${{ if eq(parameters.os, 'linux') }}:
+    ${{ if and(eq(parameters.os, 'linux'),ne(parameters.arch, 'aarch64')) }}:
       vmImage: ubuntu-20.04
+    ${{ if and(eq(parameters.os, 'linux'),eq(parameters.arch, 'aarch64')) }}:
+      name: MonoARM64
   ${{ if and(eq(parameters.os, 'linux'), eq(parameters.arch, 'i386')) }}:
     container:
       image: i386/ubuntu:20.04
       options: --platform linux/386
+  ${{ if and(eq(parameters.os, 'linux'), eq(parameters.arch, 'aarch64')) }}:
+    container:
+      image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-a45aeeb-20190620155855
+      options: --platform linux/arm64 --user 0:0
   timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
   steps:
     - checkout: self
@@ -40,7 +46,7 @@ jobs:
       - script: brew install autoconf automake libtool pkg-config cmake python3
         displayName: Install dependencies
     - ${{ if eq(parameters.os, 'linux')}}:
-      - script: sudo apt install -y autoconf libtool automake build-essential gettext cmake python3 curl
+      - script: sudo apt update && sudo apt install -y autoconf libtool automake build-essential gettext cmake python3 curl wget bc
         displayName: Install dependencies
     - script: CI_TAGS="${{ parameters.os }}-${{ parameters.arch }},$(pullRequestCITags),${{ parameters.additionalCITags }}" scripts/ci/run-jenkins.sh
       displayName: Build and Test
diff --git a/scripts/ci/mono-ci.yml b/scripts/ci/mono-ci.yml
index 0150b0edb6e..32bd9c572a5 100644
--- a/scripts/ci/mono-ci.yml
+++ b/scripts/ci/mono-ci.yml
@@ -50,6 +50,15 @@ variables:
 jobs:
 
 #
+# Linux aarch64
+#
+- template: /scripts/ci/mono-ci-job-template.yml
+  parameters:
+    displayName: Linux ARM64
+    os: linux
+    arch: aarch64
+
+#
 # Linux x64
 #
 - template: /scripts/ci/mono-ci-job-template.yml