Skip to content

Commit 7778977

Browse files
committed
chore: remove superfluous build variants
1 parent a0b1c5a commit 7778977

File tree

2 files changed

+72
-218
lines changed

2 files changed

+72
-218
lines changed

.evergreen/config.yml

Lines changed: 68 additions & 181 deletions
Original file line numberDiff line numberDiff line change
@@ -747,108 +747,12 @@ tasks:
747747
vars:
748748
VERSION: latest
749749
buildvariants:
750-
- name: debian71-test-boron
751-
display_name: Debian 7.1 Node Boron
752-
run_on: debian71-test
753-
expansions:
754-
NODE_LTS_NAME: boron
755-
tasks: &ref_0
756-
- test-3.6-server
757-
- test-3.6-replica_set
758-
- test-3.6-sharded_cluster
759-
- test-3.6-server-unified
760-
- test-3.6-replica_set-unified
761-
- test-3.6-sharded_cluster-unified
762-
- test-3.4-server
763-
- test-3.4-replica_set
764-
- test-3.4-sharded_cluster
765-
- test-3.4-server-unified
766-
- test-3.4-replica_set-unified
767-
- test-3.4-sharded_cluster-unified
768-
- test-3.2-server
769-
- test-3.2-replica_set
770-
- test-3.2-sharded_cluster
771-
- test-3.2-server-unified
772-
- test-3.2-replica_set-unified
773-
- test-3.2-sharded_cluster-unified
774-
- test-3.0-server
775-
- test-3.0-replica_set
776-
- test-3.0-sharded_cluster
777-
- test-3.0-server-unified
778-
- test-3.0-replica_set-unified
779-
- test-3.0-sharded_cluster-unified
780-
- test-2.6-server
781-
- test-2.6-replica_set
782-
- test-2.6-sharded_cluster
783-
- test-2.6-server-unified
784-
- test-2.6-replica_set-unified
785-
- test-2.6-sharded_cluster-unified
786-
- name: debian71-test-argon
787-
display_name: Debian 7.1 Node Argon
788-
run_on: debian71-test
789-
expansions:
790-
NODE_LTS_NAME: argon
791-
tasks: *ref_0
792-
- name: debian81-test-dubnium
793-
display_name: Debian 8.1 Node Dubnium
794-
run_on: debian81-test
795-
expansions:
796-
NODE_LTS_NAME: dubnium
797-
tasks: &ref_1
798-
- test-4.0-server
799-
- test-4.0-replica_set
800-
- test-4.0-sharded_cluster
801-
- test-4.0-server-unified
802-
- test-4.0-replica_set-unified
803-
- test-4.0-sharded_cluster-unified
804-
- test-3.6-server
805-
- test-3.6-replica_set
806-
- test-3.6-sharded_cluster
807-
- test-3.6-server-unified
808-
- test-3.6-replica_set-unified
809-
- test-3.6-sharded_cluster-unified
810-
- test-3.4-server
811-
- test-3.4-replica_set
812-
- test-3.4-sharded_cluster
813-
- test-3.4-server-unified
814-
- test-3.4-replica_set-unified
815-
- test-3.4-sharded_cluster-unified
816-
- name: debian81-test-carbon
817-
display_name: Debian 8.1 Node Carbon
818-
run_on: debian81-test
819-
expansions:
820-
NODE_LTS_NAME: carbon
821-
tasks: *ref_1
822-
- name: debian81-test-boron
823-
display_name: Debian 8.1 Node Boron
824-
run_on: debian81-test
825-
expansions:
826-
NODE_LTS_NAME: boron
827-
tasks: *ref_1
828-
- name: debian81-test-argon
829-
display_name: Debian 8.1 Node Argon
830-
run_on: debian81-test
831-
expansions:
832-
NODE_LTS_NAME: argon
833-
tasks: *ref_1
834-
- name: linux-64-amzn-test-boron
835-
display_name: Amazon Linux (Enterprise) Node Boron
836-
run_on: linux-64-amzn-test
837-
expansions:
838-
NODE_LTS_NAME: boron
839-
tasks: *ref_0
840-
- name: linux-64-amzn-test-argon
841-
display_name: Amazon Linux (Enterprise) Node Argon
842-
run_on: linux-64-amzn-test
843-
expansions:
844-
NODE_LTS_NAME: argon
845-
tasks: *ref_0
846750
- name: macos-1014-dubnium
847751
display_name: macOS 10.14 Node Dubnium
848752
run_on: macos-1014
849753
expansions:
850754
NODE_LTS_NAME: dubnium
851-
tasks: &ref_2
755+
tasks: &ref_0
852756
- test-latest-server
853757
- test-latest-replica_set
854758
- test-latest-sharded_cluster
@@ -903,110 +807,49 @@ buildvariants:
903807
run_on: macos-1014
904808
expansions:
905809
NODE_LTS_NAME: carbon
906-
tasks: *ref_2
810+
tasks: *ref_0
907811
- name: macos-1014-boron
908812
display_name: macOS 10.14 Node Boron
909813
run_on: macos-1014
910814
expansions:
911815
NODE_LTS_NAME: boron
912-
tasks: *ref_2
816+
tasks: *ref_0
913817
- name: macos-1014-argon
914818
display_name: macOS 10.14 Node Argon
915819
run_on: macos-1014
916820
expansions:
917821
NODE_LTS_NAME: argon
918-
tasks: *ref_2
822+
tasks: *ref_0
919823
- name: rhel70-dubnium
920824
display_name: RHEL 7.0 Node Dubnium
921825
run_on: rhel70-small
922826
expansions:
923827
NODE_LTS_NAME: dubnium
924-
tasks: *ref_2
828+
tasks: *ref_0
925829
- name: rhel70-carbon
926830
display_name: RHEL 7.0 Node Carbon
927831
run_on: rhel70-small
928832
expansions:
929833
NODE_LTS_NAME: carbon
930-
tasks: *ref_2
834+
tasks: *ref_0
931835
- name: rhel70-boron
932836
display_name: RHEL 7.0 Node Boron
933837
run_on: rhel70-small
934838
expansions:
935839
NODE_LTS_NAME: boron
936-
tasks: *ref_2
840+
tasks: *ref_0
937841
- name: rhel70-argon
938842
display_name: RHEL 7.0 Node Argon
939843
run_on: rhel70-small
940844
expansions:
941845
NODE_LTS_NAME: argon
942-
tasks: *ref_2
943-
- name: suse12-x86-64-test-dubnium
944-
display_name: SUSE 12 (x86_64) Node Dubnium
945-
run_on: suse12-test
946-
expansions:
947-
NODE_LTS_NAME: dubnium
948-
tasks: &ref_3
949-
- test-latest-server
950-
- test-latest-replica_set
951-
- test-latest-sharded_cluster
952-
- test-latest-server-unified
953-
- test-latest-replica_set-unified
954-
- test-latest-sharded_cluster-unified
955-
- test-4.2-server
956-
- test-4.2-replica_set
957-
- test-4.2-sharded_cluster
958-
- test-4.2-server-unified
959-
- test-4.2-replica_set-unified
960-
- test-4.2-sharded_cluster-unified
961-
- test-4.0-server
962-
- test-4.0-replica_set
963-
- test-4.0-sharded_cluster
964-
- test-4.0-server-unified
965-
- test-4.0-replica_set-unified
966-
- test-4.0-sharded_cluster-unified
967-
- test-3.6-server
968-
- test-3.6-replica_set
969-
- test-3.6-sharded_cluster
970-
- test-3.6-server-unified
971-
- test-3.6-replica_set-unified
972-
- test-3.6-sharded_cluster-unified
973-
- test-3.4-server
974-
- test-3.4-replica_set
975-
- test-3.4-sharded_cluster
976-
- test-3.4-server-unified
977-
- test-3.4-replica_set-unified
978-
- test-3.4-sharded_cluster-unified
979-
- test-3.2-server
980-
- test-3.2-replica_set
981-
- test-3.2-sharded_cluster
982-
- test-3.2-server-unified
983-
- test-3.2-replica_set-unified
984-
- test-3.2-sharded_cluster-unified
985-
- test-atlas-connectivity
986-
- name: suse12-x86-64-test-carbon
987-
display_name: SUSE 12 (x86_64) Node Carbon
988-
run_on: suse12-test
989-
expansions:
990-
NODE_LTS_NAME: carbon
991-
tasks: *ref_3
992-
- name: suse12-x86-64-test-boron
993-
display_name: SUSE 12 (x86_64) Node Boron
994-
run_on: suse12-test
995-
expansions:
996-
NODE_LTS_NAME: boron
997-
tasks: *ref_3
998-
- name: suse12-x86-64-test-argon
999-
display_name: SUSE 12 (x86_64) Node Argon
1000-
run_on: suse12-test
1001-
expansions:
1002-
NODE_LTS_NAME: argon
1003-
tasks: *ref_3
846+
tasks: *ref_0
1004847
- name: ubuntu-14.04-dubnium
1005848
display_name: Ubuntu 14.04 Node Dubnium
1006849
run_on: ubuntu1404-test
1007850
expansions:
1008851
NODE_LTS_NAME: dubnium
1009-
tasks: &ref_4
852+
tasks: &ref_1
1010853
- test-4.0-server
1011854
- test-4.0-replica_set
1012855
- test-4.0-sharded_cluster
@@ -1048,37 +891,81 @@ buildvariants:
1048891
run_on: ubuntu1404-test
1049892
expansions:
1050893
NODE_LTS_NAME: carbon
1051-
tasks: *ref_4
894+
tasks: *ref_1
1052895
- name: ubuntu-14.04-boron
1053896
display_name: Ubuntu 14.04 Node Boron
1054897
run_on: ubuntu1404-test
1055898
expansions:
1056899
NODE_LTS_NAME: boron
1057-
tasks: *ref_4
900+
tasks: *ref_1
1058901
- name: ubuntu-14.04-argon
1059902
display_name: Ubuntu 14.04 Node Argon
1060903
run_on: ubuntu1404-test
1061904
expansions:
1062905
NODE_LTS_NAME: argon
1063-
tasks: *ref_4
1064-
- name: ubuntu-16.04-dubnium
1065-
display_name: Ubuntu 16.04 Node Dubnium
1066-
run_on: ubuntu1604-test
906+
tasks: *ref_1
907+
- name: ubuntu-18.04-dubnium
908+
display_name: Ubuntu 18.04 Node Dubnium
909+
run_on: ubuntu1804-test
1067910
expansions:
1068911
NODE_LTS_NAME: dubnium
1069912
CLIENT_ENCRYPTION: true
1070-
tasks: *ref_3
1071-
- name: ubuntu-16.04-carbon
1072-
display_name: Ubuntu 16.04 Node Carbon
1073-
run_on: ubuntu1604-test
913+
tasks: &ref_2
914+
- test-latest-server
915+
- test-latest-replica_set
916+
- test-latest-sharded_cluster
917+
- test-latest-server-unified
918+
- test-latest-replica_set-unified
919+
- test-latest-sharded_cluster-unified
920+
- test-4.2-server
921+
- test-4.2-replica_set
922+
- test-4.2-sharded_cluster
923+
- test-4.2-server-unified
924+
- test-4.2-replica_set-unified
925+
- test-4.2-sharded_cluster-unified
926+
- test-4.0-server
927+
- test-4.0-replica_set
928+
- test-4.0-sharded_cluster
929+
- test-4.0-server-unified
930+
- test-4.0-replica_set-unified
931+
- test-4.0-sharded_cluster-unified
932+
- test-3.6-server
933+
- test-3.6-replica_set
934+
- test-3.6-sharded_cluster
935+
- test-3.6-server-unified
936+
- test-3.6-replica_set-unified
937+
- test-3.6-sharded_cluster-unified
938+
- test-3.4-server
939+
- test-3.4-replica_set
940+
- test-3.4-sharded_cluster
941+
- test-3.4-server-unified
942+
- test-3.4-replica_set-unified
943+
- test-3.4-sharded_cluster-unified
944+
- test-3.2-server
945+
- test-3.2-replica_set
946+
- test-3.2-sharded_cluster
947+
- test-3.2-server-unified
948+
- test-3.2-replica_set-unified
949+
- test-3.2-sharded_cluster-unified
950+
- test-atlas-connectivity
951+
- name: ubuntu-18.04-carbon
952+
display_name: Ubuntu 18.04 Node Carbon
953+
run_on: ubuntu1804-test
1074954
expansions:
1075955
NODE_LTS_NAME: carbon
1076956
CLIENT_ENCRYPTION: true
1077-
tasks: *ref_3
1078-
- name: ubuntu-16.04-boron
1079-
display_name: Ubuntu 16.04 Node Boron
1080-
run_on: ubuntu1604-test
957+
tasks: *ref_2
958+
- name: ubuntu-18.04-boron
959+
display_name: Ubuntu 18.04 Node Boron
960+
run_on: ubuntu1804-test
1081961
expansions:
1082962
NODE_LTS_NAME: boron
1083963
CLIENT_ENCRYPTION: true
1084-
tasks: *ref_3
964+
tasks: *ref_2
965+
- name: ubuntu-18.04-argon
966+
display_name: Ubuntu 18.04 Node Argon
967+
run_on: ubuntu1804-test
968+
expansions:
969+
NODE_LTS_NAME: argon
970+
CLIENT_ENCRYPTION: true
971+
tasks: *ref_2

.evergreen/generate_evergreen_tasks.js

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,62 +14,29 @@ const TOPOLOGIES = ['server', 'replica_set', 'sharded_cluster'].concat([
1414
]);
1515

1616
const OPERATING_SYSTEMS = [
17-
// Debian
18-
{
19-
name: 'debian71-test',
20-
display_name: 'Debian 7.1',
21-
run_on: 'debian71-test',
22-
mongoVersion: '<4.0',
23-
nodeVersions: ['argon', 'boron']
24-
},
25-
{
26-
name: 'debian81-test',
27-
display_name: 'Debian 8.1',
28-
run_on: 'debian81-test',
29-
mongoVersion: '>=3.4 <4.2'
30-
},
31-
// Amazon Linux
32-
{
33-
name: 'linux-64-amzn-test',
34-
display_name: 'Amazon Linux (Enterprise)',
35-
run_on: 'linux-64-amzn-test',
36-
mongoVersion: '<4.0',
37-
nodeVersions: ['argon', 'boron']
38-
},
39-
// macos
4017
{
4118
name: 'macos-1014',
4219
display_name: 'macOS 10.14',
4320
run_on: 'macos-1014',
4421
auth: false
4522
},
46-
// rhel
4723
{
4824
name: 'rhel70',
4925
display_name: 'RHEL 7.0',
5026
run_on: 'rhel70-small'
5127
},
52-
//suse
53-
{
54-
name: 'suse12-x86-64-test',
55-
display_name: 'SUSE 12 (x86_64)',
56-
run_on: 'suse12-test',
57-
mongoVersion: '>=3.2'
58-
},
59-
// Ubuntu
6028
{
6129
name: 'ubuntu-14.04',
6230
display_name: 'Ubuntu 14.04',
6331
run_on: 'ubuntu1404-test',
6432
mongoVersion: '<4.2'
6533
},
6634
{
67-
name: 'ubuntu-16.04',
68-
display_name: 'Ubuntu 16.04',
69-
run_on: 'ubuntu1604-test',
35+
name: 'ubuntu-18.04',
36+
display_name: 'Ubuntu 18.04',
37+
run_on: 'ubuntu1804-test',
7038
mongoVersion: '>=3.2',
71-
clientEncryption: true,
72-
nodeVersions: ['dubnium', 'carbon', 'boron']
39+
clientEncryption: true
7340
},
7441

7542
// Windows. reenable this when nvm supports windows, or we settle on an alternative tool

0 commit comments

Comments
 (0)