From 2ef8f2c6faf542def42e176d994bef6761d21b75 Mon Sep 17 00:00:00 2001
From: Katherine Walker <katherine.walker@mongodb.com>
Date: Mon, 12 Aug 2019 11:29:32 -0400
Subject: [PATCH] chore(ci): update evergreen config to test Ubuntu 18.04 on
 mongodb >= 4.2

Fixes NODE-2095
---
 .evergreen/config.yml                  | 55 ++++++++++++++++----------
 .evergreen/generate_evergreen_tasks.js |  8 +++-
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 2da15541e1..020307e83c 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -709,41 +709,25 @@ buildvariants:
     run_on: ubuntu1604-arm64-small
     expansions:
       NODE_LTS_NAME: dubnium
-    tasks: &ref_5
-      - test-latest-single
-      - test-latest-replicaset
-      - test-latest-sharded
-      - test-4.2-single
-      - test-4.2-replicaset
-      - test-4.2-sharded
-      - test-4.0-single
-      - test-4.0-replicaset
-      - test-4.0-sharded
-      - test-3.6-single
-      - test-3.6-replicaset
-      - test-3.6-sharded
-      - test-3.4-single
-      - test-3.4-replicaset
-      - test-3.4-sharded
-      - test-atlas-connectivity
+    tasks: *ref_2
   - name: ubuntu1604-arm64-small-carbon
     display_name: Ubuntu 16.04 (ARM64) Node Carbon
     run_on: ubuntu1604-arm64-small
     expansions:
       NODE_LTS_NAME: carbon
-    tasks: *ref_5
+    tasks: *ref_2
   - name: ubuntu1604-arm64-small-boron
     display_name: Ubuntu 16.04 (ARM64) Node Boron
     run_on: ubuntu1604-arm64-small
     expansions:
       NODE_LTS_NAME: boron
-    tasks: *ref_5
+    tasks: *ref_2
   - name: ubuntu1604-arm64-small-argon
     display_name: Ubuntu 16.04 (ARM64) Node Argon
     run_on: ubuntu1604-arm64-small
     expansions:
       NODE_LTS_NAME: argon
-    tasks: *ref_5
+    tasks: *ref_2
   - name: ubuntu1604-power8-test-dubnium
     display_name: Ubuntu 16.04 (POWER8) Node Dubnium
     run_on: ubuntu1604-power8-test
@@ -768,3 +752,34 @@ buildvariants:
     expansions:
       NODE_LTS_NAME: argon
     tasks: *ref_2
+  - name: ubuntu1804-arm64-test-dubnium
+    display_name: Ubuntu 18.04 (ARM64) Node Dubnium
+    run_on: ubuntu1804-arm64-test
+    expansions:
+      NODE_LTS_NAME: dubnium
+    tasks: &ref_5
+      - test-latest-single
+      - test-latest-replicaset
+      - test-latest-sharded
+      - test-4.2-single
+      - test-4.2-replicaset
+      - test-4.2-sharded
+      - test-atlas-connectivity
+  - name: ubuntu1804-arm64-test-carbon
+    display_name: Ubuntu 18.04 (ARM64) Node Carbon
+    run_on: ubuntu1804-arm64-test
+    expansions:
+      NODE_LTS_NAME: carbon
+    tasks: *ref_5
+  - name: ubuntu1804-arm64-test-boron
+    display_name: Ubuntu 18.04 (ARM64) Node Boron
+    run_on: ubuntu1804-arm64-test
+    expansions:
+      NODE_LTS_NAME: boron
+    tasks: *ref_5
+  - name: ubuntu1804-arm64-test-argon
+    display_name: Ubuntu 18.04 (ARM64) Node Argon
+    run_on: ubuntu1804-arm64-test
+    expansions:
+      NODE_LTS_NAME: argon
+    tasks: *ref_5
diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js
index ccb2a0f7fb..44f3769819 100644
--- a/.evergreen/generate_evergreen_tasks.js
+++ b/.evergreen/generate_evergreen_tasks.js
@@ -87,13 +87,19 @@ const OPERATING_SYSTEMS = [
     name: 'ubuntu1604-arm64-small',
     display_name: 'Ubuntu 16.04 (ARM64)',
     run_on: 'ubuntu1604-arm64-small',
-    mongoVersion: '>=3.4'
+    mongoVersion: '>=3.4 <4.2'
   },
   {
     name: 'ubuntu1604-power8-test',
     display_name: 'Ubuntu 16.04 (POWER8)',
     run_on: 'ubuntu1604-power8-test',
     mongoVersion: '>=3.4 <4.2'
+  },
+  {
+    name: 'ubuntu1804-arm64-test',
+    display_name: 'Ubuntu 18.04 (ARM64)',
+    run_on: 'ubuntu1804-arm64-test',
+    mongoVersion: '>=4.2'
   }
 
   // reenable when these are actually running 7.2, or we release a 7.4 rpm