SERVER-58017 Remove downloading of 3.6 binaries since they're no longer available

(cherry picked from commit 10e7a6b5662e4c3ada46c07ed7393f5e4267c2c6)

4 files changed, 5 insertions, 61 deletions

diff --git a/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml b/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml
index ca4d3313074..8738ffef191 100644
--- a/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml
+++ b/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml
@@ -13,8 +13,6 @@ evergreen_projects:
   - mongodb-mongo-v4.4
   - mongodb-mongo-v4.2
   - mongodb-mongo-v4.0
-  - mongodb-mongo-v3.6
-  - mongodb-mongo-v3.4
 
 
 evergreen_buildvariants:
@@ -238,7 +236,7 @@ evergreen_buildvariants:
     edition: base
     platform: windows_x86_64-2008plus-ssl
     architecture: x86_64
-    versions: ["3.4", "3.6", "4.0"]
+    versions: ["4.0"]
 
   - name: enterprise-windows
     edition: enterprise
@@ -249,13 +247,7 @@ evergreen_buildvariants:
     edition: enterprise
     platform: windows
     architecture: x86_64
-    versions: ["3.6", "4.0", "4.2"]
-
-  - name: enterprise-windows-64
-    edition: enterprise
-    platform: windows
-    architecture: x86_64
-    versions: ["3.4"]
+    versions: ["4.0", "4.2"]
 
   - name: macos
     edition: base
@@ -268,18 +260,6 @@ evergreen_buildvariants:
     architecture: x86_64
     versions: ["4.0"]
 
-  - name: osx-1010-ssl
-    edition: base
-    platform: osx-ssl
-    architecture: x86_64
-    versions: ["3.6"]
-
-  - name: osx-108-ssl
-    edition: base
-    platform: osx-ssl
-    architecture: x86_64
-    versions: ["3.4"]
-
   - name: enterprise-macos
     edition: enterprise
     platform: osx
@@ -289,16 +269,10 @@ evergreen_buildvariants:
     edition: enterprise
     platform: osx
     architecture: x86_64
-    versions: ["3.6", "4.0"]
-
-  - name: enterprise-osx-108
-    edition: enterprise
-    platform: osx
-    architecture: x86_64
-    versions: ["3.4"]
+    versions: ["4.0"]
 
   - name: linux-64
     edition: base
     platform: linux_x86_64
     architecture: x86_64
-    versions: ["3.4", "3.6", "4.0"]
+    versions: ["4.0"]
diff --git a/evergreen/multiversion_setup.sh b/evergreen/multiversion_setup.sh
index 20c99b9cb75..2c90d8b85cb 100644
--- a/evergreen/multiversion_setup.sh
+++ b/evergreen/multiversion_setup.sh
@@ -20,7 +20,7 @@ $python buildscripts/resmoke.py setup-multiversion \
   --edition $edition \
   --platform $platform \
   --architecture $architecture \
-  --useLatest 3.6 4.0
+  --useLatest 4.0
 
 # The platform and architecture for how some of the binaries are reported in
 # https://downloads.mongodb.org/full.json changed between MongoDB 4.0 and MongoDB 4.2.
diff --git a/jstests/multiVersion/genericSetFCVUsage/major_version_upgrade.js b/jstests/multiVersion/genericSetFCVUsage/major_version_upgrade.js
index 503047bed60..0f5be4eb615 100644
--- a/jstests/multiVersion/genericSetFCVUsage/major_version_upgrade.js
+++ b/jstests/multiVersion/genericSetFCVUsage/major_version_upgrade.js
@@ -31,7 +31,6 @@ const defaultOptions = {
 // TODO SERVER-26792: In the future, we should have a common place from which both the
 // multiversion setup procedure and this test get information about supported major releases.
 const versions = [
-    {binVersion: '3.6', featureCompatibilityVersion: '3.6', testCollection: 'three_six'},
     {binVersion: '4.0', featureCompatibilityVersion: '4.0', testCollection: 'four_zero'},
     {binVersion: '4.2', featureCompatibilityVersion: '4.2', testCollection: 'four_two'},
     {binVersion: '4.4', featureCompatibilityVersion: '4.4', testCollection: 'four_four'},
@@ -43,7 +42,6 @@ const versions = [
 // Standalone
 // Iterate from earliest to latest versions specified in the versions list, and follow the steps
 // outlined at the top of this test file.
-let authSchemaUpgraded = false;
 for (let i = 0; i < versions.length; i++) {
     let version = versions[i];
     let mongodOptions = Object.extend({binVersion: version.binVersion}, defaultOptions);
@@ -51,36 +49,9 @@ for (let i = 0; i < versions.length; i++) {
     // Start a mongod with specified version.
     let conn = MongoRunner.runMongod(mongodOptions);
 
-    if ((conn === null) && (i > 0) && !authSchemaUpgraded) {
-        // As of 4.0, mongod will refuse to start up with authSchema 3
-        // until the schema has been upgraded.
-        // Step back a version (to 3.6) in order to perform the upgrade,
-        // Then try startuing 4.0 again.
-        print(
-            "Failed starting mongod, going to try upgrading the auth schema on the prior version");
-        conn = MongoRunner.runMongod(
-            Object.extend({binVersion: versions[i - 1].binVersion}, defaultOptions));
-        assert.neq(null,
-                   conn,
-                   'mongod was previously able to start with version ' +
-                       tojson(version.binVersion) + " but now can't");
-        assert.commandWorked(conn.getDB('admin').runCommand({authSchemaUpgrade: 1}));
-        MongoRunner.stopMongod(conn);
-
-        authSchemaUpgraded = true;
-        conn = MongoRunner.runMongod(mongodOptions);
-    }
-
     assert.neq(null, conn, 'mongod was unable to start up with options: ' + tojson(mongodOptions));
     assert.binVersion(conn, version.binVersion);
 
-    if ((i === 0) && (version.binVersion <= 3.6)) {
-        // Simulate coming from a <= 2.6 installation where MONGODB-CR was the default/only
-        // authentication mechanism. Eventually, the upgrade process will fail (above) when
-        // running on 4.0 where support for MONGODB-CR has been removed.
-        conn.getDB('admin').system.version.save({"_id": "authSchema", "currentVersion": 3});
-    }
-
     // Connect to the 'test' database.
     let testDB = conn.getDB('test');
 
diff --git a/jstests/multiVersion/skip_level_upgrade.js b/jstests/multiVersion/skip_level_upgrade.js
index ec313e3f4a0..f932c86644c 100644
--- a/jstests/multiVersion/skip_level_upgrade.js
+++ b/jstests/multiVersion/skip_level_upgrade.js
@@ -31,7 +31,6 @@ const defaultOptions = {
 // TODO SERVER-26792: In the future, we should have a common place from which both the
 // multiversion setup procedure and this test get information about supported major releases.
 const versions = [
-    {binVersion: '3.6', testCollection: 'three_six'},
     {binVersion: '4.0', testCollection: 'four_zero'},
     {binVersion: '4.2', testCollection: 'four_two'}
 ];