Skip to content

Commit 099453f

Browse files
behackettbehackett
committed
Migrate testing to Ubuntu 12.04
This commit also cleans up the Evergreen config file and fixes a test for MongoDB 3.5+.
1 parent b95a4d8 commit 099453f

File tree

4 files changed

+93
-199
lines changed

4 files changed

+93
-199
lines changed

‎.evergreen/config.yml‎

Lines changed: 75 additions & 193 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ functions:
334334
working_dir: "src"
335335
script: |
336336
${PREPARE_SHELL}
337-
PYTHON_BINARY=${PYTHON_BINARY} C_EXTENSIONS=${C_EXTENSIONS} AUTH=${AUTH} SSL=${SSL} MONGODB_URI="${MONGODB_URI}" sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
337+
PYTHON_BINARY=${PYTHON_BINARY} C_EXTENSIONS=${C_EXTENSIONS} AUTH=${AUTH} SSL=${SSL} sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
338338
339339
"run enterprise auth tests":
340340
- command: shell.exec
@@ -654,15 +654,10 @@ axes:
654654
variables:
655655
VERSION: "2.4"
656656

657-
658657
# OSes that support versions of MongoDB>=2.4 with SSL.
659658
- id: os-fully-featured
660659
display_name: OS
661660
values:
662-
- id: ubuntu1204-test
663-
display_name: "Ubuntu 12.04"
664-
run_on: ubuntu1204-test
665-
666661
- id: suse11-x86-64-test
667662
display_name: "SUSE 11 (x86_64)"
668663
run_on: suse11-test
@@ -707,6 +702,10 @@ axes:
707702
- id: os-requires-32
708703
display_name: OS
709704
values:
705+
- id: ubuntu1604-test
706+
display_name: "Ubuntu 16.04"
707+
run_on: ubuntu1604-test
708+
710709
- id: suse12-x86-64-test
711710
display_name: "SUSE 12 (x86_64)"
712711
run_on: suse12-test
@@ -907,211 +906,108 @@ axes:
907906
buildvariants:
908907

909908
- matrix_name: "tests-all"
910-
matrix_spec: {"os-fully-featured": "*", auth: "*", ssl: "*" }
909+
matrix_spec: {"os-fully-featured": "*", auth: "*", ssl: "*"}
911910
display_name: "${os-fully-featured} ${auth} ${ssl}"
912911
tasks:
913-
- name: "test-latest-replica_set"
914-
- name: "test-latest-sharded_cluster"
915-
- name: "test-latest-standalone"
916-
- name: "test-3.4-replica_set"
917-
- name: "test-3.4-sharded_cluster"
918-
- name: "test-3.4-standalone"
919-
- name: "test-3.2-replica_set"
920-
- name: "test-3.2-sharded_cluster"
921-
- name: "test-3.2-standalone"
922-
- name: "test-3.0-replica_set"
923-
- name: "test-3.0-sharded_cluster"
924-
- name: "test-3.0-standalone"
925-
- name: "test-2.6-replica_set"
926-
- name: "test-2.6-sharded_cluster"
927-
- name: "test-2.6-standalone"
928-
- name: "test-2.4-replica_set"
929-
- name: "test-2.4-sharded_cluster"
930-
- name: "test-2.4-standalone"
912+
- ".latest"
913+
- ".3.4"
914+
- ".3.2"
915+
- ".3.0"
916+
- ".2.6"
917+
- ".2.4"
931918

932919
- matrix_name: "tests-nossl"
933-
matrix_spec: {"os-nossl": "*", auth: "*", ssl: "nossl" }
920+
matrix_spec: {"os-nossl": "*", auth: "*", ssl: "nossl"}
934921
display_name: "${os-nossl} ${auth} ${ssl}"
935922
tasks:
936-
- name: "test-latest-replica_set"
937-
- name: "test-latest-sharded_cluster"
938-
- name: "test-latest-standalone"
939-
- name: "test-3.4-replica_set"
940-
- name: "test-3.4-sharded_cluster"
941-
- name: "test-3.4-standalone"
942-
- name: "test-3.2-replica_set"
943-
- name: "test-3.2-sharded_cluster"
944-
- name: "test-3.2-standalone"
945-
- name: "test-3.0-replica_set"
946-
- name: "test-3.0-sharded_cluster"
947-
- name: "test-3.0-standalone"
948-
- name: "test-2.6-replica_set"
949-
- name: "test-2.6-sharded_cluster"
950-
- name: "test-2.6-standalone"
951-
- name: "test-2.4-replica_set"
952-
- name: "test-2.4-sharded_cluster"
953-
- name: "test-2.4-standalone"
923+
- ".latest"
924+
- ".3.4"
925+
- ".3.2"
926+
- ".3.0"
927+
- ".2.6"
928+
- ".2.4"
954929

955930
- matrix_name: "tests-os-requires-26"
956-
matrix_spec: {"os-requires-26": "*", auth: "*", ssl: "*" }
931+
matrix_spec: {"os-requires-26": "*", auth: "*", ssl: "*"}
957932
display_name: "${os-requires-26} ${auth} ${ssl}"
958933
tasks:
959-
- name: "test-latest-replica_set"
960-
- name: "test-latest-sharded_cluster"
961-
- name: "test-latest-standalone"
962-
- name: "test-3.4-replica_set"
963-
- name: "test-3.4-sharded_cluster"
964-
- name: "test-3.4-standalone"
965-
- name: "test-3.2-replica_set"
966-
- name: "test-3.2-sharded_cluster"
967-
- name: "test-3.2-standalone"
968-
- name: "test-3.0-replica_set"
969-
- name: "test-3.0-sharded_cluster"
970-
- name: "test-3.0-standalone"
971-
- name: "test-2.6-replica_set"
972-
- name: "test-2.6-sharded_cluster"
973-
- name: "test-2.6-standalone"
934+
- ".latest"
935+
- ".3.4"
936+
- ".3.2"
937+
- ".3.0"
938+
- ".2.6"
974939

975940
- matrix_name: "tests-os-requires-32"
976-
matrix_spec: {"os-requires-32": "*", auth: "*", ssl: "*" }
941+
matrix_spec: {"os-requires-32": "*", auth: "*", ssl: "*"}
977942
display_name: "${os-requires-32} ${auth} ${ssl}"
978943
tasks:
979-
- name: "test-latest-replica_set"
980-
- name: "test-latest-sharded_cluster"
981-
- name: "test-latest-standalone"
982-
- name: "test-3.4-replica_set"
983-
- name: "test-3.4-sharded_cluster"
984-
- name: "test-3.4-standalone"
985-
- name: "test-3.2-replica_set"
986-
- name: "test-3.2-sharded_cluster"
987-
- name: "test-3.2-standalone"
944+
- ".latest"
945+
- ".3.4"
946+
- ".3.2"
988947

989948
- matrix_name: "tests-ssl-requires-32"
990-
matrix_spec: {"os-ssl-requires-32": "*", auth: "*", ssl: "ssl" }
949+
matrix_spec: {"os-ssl-requires-32": "*", auth: "*", ssl: "ssl"}
991950
display_name: "${os-ssl-requires-32} ${auth} ${ssl}"
992951
tasks:
993-
- name: "test-latest-replica_set"
994-
- name: "test-latest-sharded_cluster"
995-
- name: "test-latest-standalone"
996-
- name: "test-3.4-replica_set"
997-
- name: "test-3.4-sharded_cluster"
998-
- name: "test-3.4-standalone"
999-
- name: "test-3.2-replica_set"
1000-
- name: "test-3.2-sharded_cluster"
1001-
- name: "test-3.2-standalone"
952+
- ".latest"
953+
- ".3.4"
954+
- ".3.2"
1002955

1003956
- matrix_name: "tests-os-requires-34"
1004-
matrix_spec: {"os-requires-34": "*", auth: "*", ssl: "*" }
957+
matrix_spec: {"os-requires-34": "*", auth: "*", ssl: "*"}
1005958
display_name: "${os-requires-34} ${auth} ${ssl}"
1006959
tasks:
1007-
- name: "test-latest-replica_set"
1008-
- name: "test-latest-sharded_cluster"
1009-
- name: "test-latest-standalone"
1010-
- name: "test-3.4-replica_set"
1011-
- name: "test-3.4-sharded_cluster"
1012-
- name: "test-3.4-standalone"
960+
- ".latest"
961+
- ".3.4"
1013962

1014-
1015-
# Test all versions of Python against all versions of MongoDB >= 3.2.
1016-
- matrix_name: "tests-python-version-ubuntu1604-test-ssl"
1017-
matrix_spec: {"python-version": "*", auth: "*", ssl: "ssl" }
963+
- matrix_name: "tests-python-version-ubuntu1204-test-ssl"
964+
matrix_spec: {"python-version": "*", auth: "*", ssl: "*"}
1018965
exclude_spec:
1019966
# PYTHON-498: disable Jython SSL tests
1020967
python-version: ["jython2.5", "jython2.7"]
1021968
# EVG-1410: exlcude_spec must specifiy values for all axes
1022969
auth: "*"
1023970
ssl: "ssl"
1024-
display_name: "${python-version} Ubuntu 16.04 (x86_64) ${auth} ${ssl}"
1025-
run_on: ubuntu1604-test
1026-
tasks:
1027-
- name: "test-latest-replica_set"
1028-
- name: "test-latest-sharded_cluster"
1029-
- name: "test-latest-standalone"
1030-
- name: "test-3.4-replica_set"
1031-
- name: "test-3.4-sharded_cluster"
1032-
- name: "test-3.4-standalone"
1033-
- name: "test-3.2-replica_set"
1034-
- name: "test-3.2-sharded_cluster"
1035-
- name: "test-3.2-standalone"
1036-
1037-
# Test all versions of Python against all versions on MongoDB <= 3.0.
1038-
# MongoDB <=3.0 on Ubuntu 16.04 (x86_64) does not support SSL.
1039-
- matrix_name: "tests-python-version-ubuntu1604-test-nossl"
1040-
matrix_spec: {"python-version": "*", auth: "*", ssl: "nossl" }
1041-
display_name: "${python-version} Ubuntu 16.04 (x86_64) ${auth} ${ssl}"
1042-
run_on: ubuntu1604-test
971+
display_name: "${python-version} Ubuntu 12.04 (x86_64) ${auth} ${ssl}"
972+
run_on: ubuntu1204-test
1043973
tasks:
1044-
- name: "test-latest-replica_set"
1045-
- name: "test-latest-sharded_cluster"
1046-
- name: "test-latest-standalone"
1047-
- name: "test-3.4-replica_set"
1048-
- name: "test-3.4-sharded_cluster"
1049-
- name: "test-3.4-standalone"
1050-
- name: "test-3.2-replica_set"
1051-
- name: "test-3.2-sharded_cluster"
1052-
- name: "test-3.2-standalone"
1053-
- name: "test-3.0-replica_set"
1054-
- name: "test-3.0-sharded_cluster"
1055-
- name: "test-3.0-standalone"
1056-
- name: "test-2.6-replica_set"
1057-
- name: "test-2.6-sharded_cluster"
1058-
- name: "test-2.6-standalone"
1059-
- name: "test-2.4-replica_set"
1060-
- name: "test-2.4-sharded_cluster"
1061-
- name: "test-2.4-standalone"
1062-
1063-
- matrix_name: "tests-python-version-ubuntu1604-without-c-extensions"
1064-
matrix_spec: {"python-version": "*", "c-extensions": "without-c-extensions", auth: "noauth", ssl: "nossl" }
974+
- ".latest"
975+
- ".3.4"
976+
- ".3.2"
977+
- ".3.0"
978+
- ".2.6"
979+
- ".2.4"
980+
981+
- matrix_name: "tests-python-version-ubuntu1204-without-c-extensions"
982+
matrix_spec: {"python-version": "*", "c-extensions": "without-c-extensions", auth: "noauth", ssl: "nossl"}
1065983
exclude_spec:
1066984
# These interpreters are always tested without extensions.
1067985
- python-version: ["pypy", "pypy3", "jython2.5", "jython2.7"]
1068986
c-extensions: "*"
1069987
auth: "*"
1070988
ssl: "*"
1071-
display_name: "${c-extensions} ${python-version} Ubuntu 16.04 (x86_64) ${auth} ${ssl}"
1072-
run_on: ubuntu1604-test
989+
display_name: "${c-extensions} ${python-version} Ubuntu 12.04 (x86_64) ${auth} ${ssl}"
990+
run_on: ubuntu1204-test
1073991
tasks:
1074-
- name: "test-latest-replica_set"
1075-
- name: "test-latest-sharded_cluster"
1076-
- name: "test-latest-standalone"
1077-
- name: "test-3.4-replica_set"
1078-
- name: "test-3.4-sharded_cluster"
1079-
- name: "test-3.4-standalone"
1080-
- name: "test-3.2-replica_set"
1081-
- name: "test-3.2-sharded_cluster"
1082-
- name: "test-3.2-standalone"
1083-
- name: "test-3.0-replica_set"
1084-
- name: "test-3.0-sharded_cluster"
1085-
- name: "test-3.0-standalone"
1086-
- name: "test-2.6-replica_set"
1087-
- name: "test-2.6-sharded_cluster"
1088-
- name: "test-2.6-standalone"
1089-
- name: "test-2.4-replica_set"
1090-
- name: "test-2.4-sharded_cluster"
1091-
- name: "test-2.4-standalone"
992+
- ".latest"
993+
- ".3.4"
994+
- ".3.2"
995+
- ".3.0"
996+
- ".2.6"
997+
- ".2.4"
1092998

1093999
# Test CPython 3.3 and 3.4 against all versions on MongoDB >= 2.4
10941000
# on Windows with Visual Studio 2010.
10951001
- matrix_name: "tests-windows-vs2010-python-version-nossl"
1096-
matrix_spec: {windows-vs2010-python-version: "*", auth: "*", ssl: "*" }
1002+
matrix_spec: {windows-vs2010-python-version: "*", auth: "*", ssl: "*"}
10971003
display_name: "Windows 64 Visual Studio 2010 ${windows-vs2010-python-version} ${auth} ${ssl}"
10981004
run_on: windows-64-vs2010-test
10991005
tasks:
1100-
- name: "test-latest-replica_set"
1101-
- name: "test-latest-sharded_cluster"
1102-
- name: "test-latest-standalone"
1103-
- name: "test-3.4-replica_set"
1104-
- name: "test-3.4-sharded_cluster"
1105-
- name: "test-3.4-standalone"
1106-
- name: "test-3.2-replica_set"
1107-
- name: "test-3.2-sharded_cluster"
1108-
- name: "test-3.2-standalone"
1109-
- name: "test-3.0-replica_set"
1110-
- name: "test-3.0-sharded_cluster"
1111-
- name: "test-3.0-standalone"
1112-
- name: "test-2.6-replica_set"
1113-
- name: "test-2.6-sharded_cluster"
1114-
- name: "test-2.6-standalone"
1006+
- ".latest"
1007+
- ".3.4"
1008+
- ".3.2"
1009+
- ".3.0"
1010+
- ".2.6"
11151011
rules:
11161012
# Windows MongoDB 2.4 does not support SSL.
11171013
- if:
@@ -1120,32 +1016,20 @@ buildvariants:
11201016
ssl: "nossl"
11211017
then:
11221018
add_tasks:
1123-
- name: "test-2.4-replica_set"
1124-
- name: "test-2.4-sharded_cluster"
1125-
- name: "test-2.4-standalone"
1019+
- ".2.4"
11261020

11271021
# Test CPython 2.6, 2.7, 3.2, 3.5 and 3.6 against all versions on MongoDB >= 2.4
11281022
# on Windows with the Microsoft Visual C++ Compiler for Python 2.7 or Visual Studio 2015.
11291023
- matrix_name: "tests-windows-vs2015-python-version-nossl"
1130-
matrix_spec: {windows-vs2015-python-version: "*", auth: "*", ssl: "*" }
1024+
matrix_spec: {windows-vs2015-python-version: "*", auth: "*", ssl: "*"}
11311025
display_name: "Windows 64 Visual Studio 2015 ${windows-vs2015-python-version} ${auth} ${ssl}"
11321026
run_on: windows-64-vs2015-test
11331027
tasks:
1134-
- name: "test-latest-replica_set"
1135-
- name: "test-latest-sharded_cluster"
1136-
- name: "test-latest-standalone"
1137-
- name: "test-3.4-replica_set"
1138-
- name: "test-3.4-sharded_cluster"
1139-
- name: "test-3.4-standalone"
1140-
- name: "test-3.2-replica_set"
1141-
- name: "test-3.2-sharded_cluster"
1142-
- name: "test-3.2-standalone"
1143-
- name: "test-3.0-replica_set"
1144-
- name: "test-3.0-sharded_cluster"
1145-
- name: "test-3.0-standalone"
1146-
- name: "test-2.6-replica_set"
1147-
- name: "test-2.6-sharded_cluster"
1148-
- name: "test-2.6-standalone"
1028+
- ".latest"
1029+
- ".3.4"
1030+
- ".3.2"
1031+
- ".3.0"
1032+
- ".2.6"
11491033
rules:
11501034
# Windows MongoDB 2.4 does not support SSL.
11511035
- if:
@@ -1154,15 +1038,13 @@ buildvariants:
11541038
ssl: "nossl"
11551039
then:
11561040
add_tasks:
1157-
- name: "test-2.4-replica_set"
1158-
- name: "test-2.4-sharded_cluster"
1159-
- name: "test-2.4-standalone"
1041+
- ".2.4"
11601042

1161-
# Storage engine tests on Ubuntu 16.04 (x86_64) with Python 2.7.
1043+
# Storage engine tests on Ubuntu 12.04 (x86_64) with Python 2.7.
11621044
- matrix_name: "tests-storage-engines"
11631045
matrix_spec: {storage-engine: "*", python-version: "2.7"}
1164-
display_name: "Storage ${storage-engine} ${python-version} Ubuntu 16.04 (x86_64)"
1165-
run_on: ubuntu1604-test
1046+
display_name: "Storage ${storage-engine} ${python-version} Ubuntu 12.04 (x86_64)"
1047+
run_on: ubuntu1204-test
11661048
rules:
11671049
- if:
11681050
storage-engine: ["mmapv1", "inmemory"]
@@ -1182,7 +1064,7 @@ buildvariants:
11821064
- matrix_name: "test-linux-enterprise-auth"
11831065
matrix_spec: {"python-version": "*", auth: "auth"}
11841066
display_name: "Enterprise Auth Linux ${python-version}"
1185-
run_on: ubuntu1604-test
1067+
run_on: ubuntu1204-test
11861068
tasks:
11871069
- name: "test-enterprise-auth"
11881070

‎.evergreen/run-enterprise-auth-tests.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ set -o errexit
55

66
echo "Running enterprise authentication tests"
77

8+
export JAVA_HOME=/opt/java/jdk8
9+
810
PYTHON_VERSION=$(${PYTHON_BINARY} -c 'import sys; sys.stdout.write(str(sys.version_info[0]))')
9-
PLATFORM="$(${PYTHON_BINARY} -c 'import platform; print(platform.system())')"
11+
PLATFORM="$(${PYTHON_BINARY} -c 'import platform, sys; sys.stdout.write(platform.system())')"
1012

1113
export DB_USER="bob"
1214
export DB_PASSWORD="pwd123"

0 commit comments

Comments
 (0)