From 77789773702d7c994f7e58ccda021c1d76b47ba1 Mon Sep 17 00:00:00 2001 From: Matt Broadstone Date: Fri, 27 Mar 2020 14:30:31 -0400 Subject: [PATCH] chore: remove superfluous build variants --- .evergreen/config.yml | 249 +++++++------------------ .evergreen/generate_evergreen_tasks.js | 41 +--- 2 files changed, 72 insertions(+), 218 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 81b0ce148f..fe51464313 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -747,108 +747,12 @@ tasks: vars: VERSION: latest buildvariants: - - name: debian71-test-boron - display_name: Debian 7.1 Node Boron - run_on: debian71-test - expansions: - NODE_LTS_NAME: boron - tasks: &ref_0 - - test-3.6-server - - test-3.6-replica_set - - test-3.6-sharded_cluster - - test-3.6-server-unified - - test-3.6-replica_set-unified - - test-3.6-sharded_cluster-unified - - test-3.4-server - - test-3.4-replica_set - - test-3.4-sharded_cluster - - test-3.4-server-unified - - test-3.4-replica_set-unified - - test-3.4-sharded_cluster-unified - - test-3.2-server - - test-3.2-replica_set - - test-3.2-sharded_cluster - - test-3.2-server-unified - - test-3.2-replica_set-unified - - test-3.2-sharded_cluster-unified - - test-3.0-server - - test-3.0-replica_set - - test-3.0-sharded_cluster - - test-3.0-server-unified - - test-3.0-replica_set-unified - - test-3.0-sharded_cluster-unified - - test-2.6-server - - test-2.6-replica_set - - test-2.6-sharded_cluster - - test-2.6-server-unified - - test-2.6-replica_set-unified - - test-2.6-sharded_cluster-unified - - name: debian71-test-argon - display_name: Debian 7.1 Node Argon - run_on: debian71-test - expansions: - NODE_LTS_NAME: argon - tasks: *ref_0 - - name: debian81-test-dubnium - display_name: Debian 8.1 Node Dubnium - run_on: debian81-test - expansions: - NODE_LTS_NAME: dubnium - tasks: &ref_1 - - test-4.0-server - - test-4.0-replica_set - - test-4.0-sharded_cluster - - test-4.0-server-unified - - test-4.0-replica_set-unified - - test-4.0-sharded_cluster-unified - - test-3.6-server - - test-3.6-replica_set - - test-3.6-sharded_cluster - - test-3.6-server-unified - - test-3.6-replica_set-unified - - test-3.6-sharded_cluster-unified - - test-3.4-server - - test-3.4-replica_set - - test-3.4-sharded_cluster - - test-3.4-server-unified - - test-3.4-replica_set-unified - - test-3.4-sharded_cluster-unified - - name: debian81-test-carbon - display_name: Debian 8.1 Node Carbon - run_on: debian81-test - expansions: - NODE_LTS_NAME: carbon - tasks: *ref_1 - - name: debian81-test-boron - display_name: Debian 8.1 Node Boron - run_on: debian81-test - expansions: - NODE_LTS_NAME: boron - tasks: *ref_1 - - name: debian81-test-argon - display_name: Debian 8.1 Node Argon - run_on: debian81-test - expansions: - NODE_LTS_NAME: argon - tasks: *ref_1 - - name: linux-64-amzn-test-boron - display_name: Amazon Linux (Enterprise) Node Boron - run_on: linux-64-amzn-test - expansions: - NODE_LTS_NAME: boron - tasks: *ref_0 - - name: linux-64-amzn-test-argon - display_name: Amazon Linux (Enterprise) Node Argon - run_on: linux-64-amzn-test - expansions: - NODE_LTS_NAME: argon - tasks: *ref_0 - name: macos-1014-dubnium display_name: macOS 10.14 Node Dubnium run_on: macos-1014 expansions: NODE_LTS_NAME: dubnium - tasks: &ref_2 + tasks: &ref_0 - test-latest-server - test-latest-replica_set - test-latest-sharded_cluster @@ -903,110 +807,49 @@ buildvariants: run_on: macos-1014 expansions: NODE_LTS_NAME: carbon - tasks: *ref_2 + tasks: *ref_0 - name: macos-1014-boron display_name: macOS 10.14 Node Boron run_on: macos-1014 expansions: NODE_LTS_NAME: boron - tasks: *ref_2 + tasks: *ref_0 - name: macos-1014-argon display_name: macOS 10.14 Node Argon run_on: macos-1014 expansions: NODE_LTS_NAME: argon - tasks: *ref_2 + tasks: *ref_0 - name: rhel70-dubnium display_name: RHEL 7.0 Node Dubnium run_on: rhel70-small expansions: NODE_LTS_NAME: dubnium - tasks: *ref_2 + tasks: *ref_0 - name: rhel70-carbon display_name: RHEL 7.0 Node Carbon run_on: rhel70-small expansions: NODE_LTS_NAME: carbon - tasks: *ref_2 + tasks: *ref_0 - name: rhel70-boron display_name: RHEL 7.0 Node Boron run_on: rhel70-small expansions: NODE_LTS_NAME: boron - tasks: *ref_2 + tasks: *ref_0 - name: rhel70-argon display_name: RHEL 7.0 Node Argon run_on: rhel70-small expansions: NODE_LTS_NAME: argon - tasks: *ref_2 - - name: suse12-x86-64-test-dubnium - display_name: SUSE 12 (x86_64) Node Dubnium - run_on: suse12-test - expansions: - NODE_LTS_NAME: dubnium - tasks: &ref_3 - - test-latest-server - - test-latest-replica_set - - test-latest-sharded_cluster - - test-latest-server-unified - - test-latest-replica_set-unified - - test-latest-sharded_cluster-unified - - test-4.2-server - - test-4.2-replica_set - - test-4.2-sharded_cluster - - test-4.2-server-unified - - test-4.2-replica_set-unified - - test-4.2-sharded_cluster-unified - - test-4.0-server - - test-4.0-replica_set - - test-4.0-sharded_cluster - - test-4.0-server-unified - - test-4.0-replica_set-unified - - test-4.0-sharded_cluster-unified - - test-3.6-server - - test-3.6-replica_set - - test-3.6-sharded_cluster - - test-3.6-server-unified - - test-3.6-replica_set-unified - - test-3.6-sharded_cluster-unified - - test-3.4-server - - test-3.4-replica_set - - test-3.4-sharded_cluster - - test-3.4-server-unified - - test-3.4-replica_set-unified - - test-3.4-sharded_cluster-unified - - test-3.2-server - - test-3.2-replica_set - - test-3.2-sharded_cluster - - test-3.2-server-unified - - test-3.2-replica_set-unified - - test-3.2-sharded_cluster-unified - - test-atlas-connectivity - - name: suse12-x86-64-test-carbon - display_name: SUSE 12 (x86_64) Node Carbon - run_on: suse12-test - expansions: - NODE_LTS_NAME: carbon - tasks: *ref_3 - - name: suse12-x86-64-test-boron - display_name: SUSE 12 (x86_64) Node Boron - run_on: suse12-test - expansions: - NODE_LTS_NAME: boron - tasks: *ref_3 - - name: suse12-x86-64-test-argon - display_name: SUSE 12 (x86_64) Node Argon - run_on: suse12-test - expansions: - NODE_LTS_NAME: argon - tasks: *ref_3 + tasks: *ref_0 - name: ubuntu-14.04-dubnium display_name: Ubuntu 14.04 Node Dubnium run_on: ubuntu1404-test expansions: NODE_LTS_NAME: dubnium - tasks: &ref_4 + tasks: &ref_1 - test-4.0-server - test-4.0-replica_set - test-4.0-sharded_cluster @@ -1048,37 +891,81 @@ buildvariants: run_on: ubuntu1404-test expansions: NODE_LTS_NAME: carbon - tasks: *ref_4 + tasks: *ref_1 - name: ubuntu-14.04-boron display_name: Ubuntu 14.04 Node Boron run_on: ubuntu1404-test expansions: NODE_LTS_NAME: boron - tasks: *ref_4 + tasks: *ref_1 - name: ubuntu-14.04-argon display_name: Ubuntu 14.04 Node Argon run_on: ubuntu1404-test expansions: NODE_LTS_NAME: argon - tasks: *ref_4 - - name: ubuntu-16.04-dubnium - display_name: Ubuntu 16.04 Node Dubnium - run_on: ubuntu1604-test + tasks: *ref_1 + - name: ubuntu-18.04-dubnium + display_name: Ubuntu 18.04 Node Dubnium + run_on: ubuntu1804-test expansions: NODE_LTS_NAME: dubnium CLIENT_ENCRYPTION: true - tasks: *ref_3 - - name: ubuntu-16.04-carbon - display_name: Ubuntu 16.04 Node Carbon - run_on: ubuntu1604-test + tasks: &ref_2 + - test-latest-server + - test-latest-replica_set + - test-latest-sharded_cluster + - test-latest-server-unified + - test-latest-replica_set-unified + - test-latest-sharded_cluster-unified + - test-4.2-server + - test-4.2-replica_set + - test-4.2-sharded_cluster + - test-4.2-server-unified + - test-4.2-replica_set-unified + - test-4.2-sharded_cluster-unified + - test-4.0-server + - test-4.0-replica_set + - test-4.0-sharded_cluster + - test-4.0-server-unified + - test-4.0-replica_set-unified + - test-4.0-sharded_cluster-unified + - test-3.6-server + - test-3.6-replica_set + - test-3.6-sharded_cluster + - test-3.6-server-unified + - test-3.6-replica_set-unified + - test-3.6-sharded_cluster-unified + - test-3.4-server + - test-3.4-replica_set + - test-3.4-sharded_cluster + - test-3.4-server-unified + - test-3.4-replica_set-unified + - test-3.4-sharded_cluster-unified + - test-3.2-server + - test-3.2-replica_set + - test-3.2-sharded_cluster + - test-3.2-server-unified + - test-3.2-replica_set-unified + - test-3.2-sharded_cluster-unified + - test-atlas-connectivity + - name: ubuntu-18.04-carbon + display_name: Ubuntu 18.04 Node Carbon + run_on: ubuntu1804-test expansions: NODE_LTS_NAME: carbon CLIENT_ENCRYPTION: true - tasks: *ref_3 - - name: ubuntu-16.04-boron - display_name: Ubuntu 16.04 Node Boron - run_on: ubuntu1604-test + tasks: *ref_2 + - name: ubuntu-18.04-boron + display_name: Ubuntu 18.04 Node Boron + run_on: ubuntu1804-test expansions: NODE_LTS_NAME: boron CLIENT_ENCRYPTION: true - tasks: *ref_3 + tasks: *ref_2 + - name: ubuntu-18.04-argon + display_name: Ubuntu 18.04 Node Argon + run_on: ubuntu1804-test + expansions: + NODE_LTS_NAME: argon + CLIENT_ENCRYPTION: true + tasks: *ref_2 diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index b4bfe3a358..466577e0a9 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -14,49 +14,17 @@ const TOPOLOGIES = ['server', 'replica_set', 'sharded_cluster'].concat([ ]); const OPERATING_SYSTEMS = [ - // Debian - { - name: 'debian71-test', - display_name: 'Debian 7.1', - run_on: 'debian71-test', - mongoVersion: '<4.0', - nodeVersions: ['argon', 'boron'] - }, - { - name: 'debian81-test', - display_name: 'Debian 8.1', - run_on: 'debian81-test', - mongoVersion: '>=3.4 <4.2' - }, - // Amazon Linux - { - name: 'linux-64-amzn-test', - display_name: 'Amazon Linux (Enterprise)', - run_on: 'linux-64-amzn-test', - mongoVersion: '<4.0', - nodeVersions: ['argon', 'boron'] - }, - // macos { name: 'macos-1014', display_name: 'macOS 10.14', run_on: 'macos-1014', auth: false }, - // rhel { name: 'rhel70', display_name: 'RHEL 7.0', run_on: 'rhel70-small' }, - //suse - { - name: 'suse12-x86-64-test', - display_name: 'SUSE 12 (x86_64)', - run_on: 'suse12-test', - mongoVersion: '>=3.2' - }, - // Ubuntu { name: 'ubuntu-14.04', display_name: 'Ubuntu 14.04', @@ -64,12 +32,11 @@ const OPERATING_SYSTEMS = [ mongoVersion: '<4.2' }, { - name: 'ubuntu-16.04', - display_name: 'Ubuntu 16.04', - run_on: 'ubuntu1604-test', + name: 'ubuntu-18.04', + display_name: 'Ubuntu 18.04', + run_on: 'ubuntu1804-test', mongoVersion: '>=3.2', - clientEncryption: true, - nodeVersions: ['dubnium', 'carbon', 'boron'] + clientEncryption: true }, // Windows. reenable this when nvm supports windows, or we settle on an alternative tool