Skip to content

Commit c142cec

Browse files
jyeminjyemin
committed
Revert "Evergreen: Support new java toolchain feature"
This reverts commit 6ba562e.
1 parent 9d5e581 commit c142cec

21 files changed

+109
-89
lines changed

‎.evergreen/.evg.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ functions:
3232
# Applies the subitted patch, if any
3333
# Deprecated. Should be removed. But still needed for certain agents (ZAP)
3434
- command: git.apply_patch
35-
# Make an evergreen expansion file with dynamic values
35+
# Make an evergreen exapanstion file with dynamic values
3636
- command: shell.exec
3737
params:
3838
working_dir: "src"
@@ -296,7 +296,7 @@ functions:
296296
export AWS_DEFAULT_REGION=us-east-1
297297
. ${DRIVERS_TOOLS}/.evergreen/csfle/set-temp-creds.sh
298298
AUTH="${AUTH}" SSL="${SSL}" MONGODB_URI="${MONGODB_URI}" SAFE_FOR_MULTI_MONGOS="${SAFE_FOR_MULTI_MONGOS}" TOPOLOGY="${TOPOLOGY}" \
299-
COMPRESSOR="${COMPRESSOR}" JAVA_VERSION="${JAVA_VERSION}" \
299+
COMPRESSOR="${COMPRESSOR}" JDK="${JDK}" \
300300
AWS_ACCESS_KEY_ID=${aws_access_key_id} AWS_SECRET_ACCESS_KEY=${aws_secret_access_key} \
301301
AWS_TEMP_ACCESS_KEY_ID=$CSFLE_AWS_TEMP_ACCESS_KEY_ID \
302302
AWS_TEMP_SECRET_ACCESS_KEY=$CSFLE_AWS_TEMP_SECRET_ACCESS_KEY \
@@ -313,7 +313,7 @@ functions:
313313
working_dir: "src"
314314
script: |
315315
${PREPARE_SHELL}
316-
AUTH="${AUTH}" SSL="${SSL}" JAVA_VERSION="${JAVA_VERSION}" \
316+
AUTH="${AUTH}" SSL="${SSL}" JDK="${JDK}" \
317317
SINGLE_MONGOS_LB_URI="${SINGLE_MONGOS_LB_URI}" \
318318
MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}" \
319319
.evergreen/run-load-balancer-tests.sh
@@ -325,7 +325,7 @@ functions:
325325
working_dir: "src"
326326
script: |
327327
${PREPARE_SHELL}
328-
JAVA_VERSION="${JAVA_VERSION}" \
328+
JDK="${JDK}" \
329329
SINGLE_ATLASPROXY_SERVERLESS_URI="${SINGLE_ATLASPROXY_SERVERLESS_URI}" \
330330
MULTI_ATLASPROXY_SERVERLESS_URI="${MULTI_ATLASPROXY_SERVERLESS_URI}" \
331331
SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}" \
@@ -348,7 +348,7 @@ functions:
348348
working_dir: "src"
349349
script: |
350350
${PREPARE_SHELL}
351-
AUTH="${AUTH}" SSL="${SSL}" MONGODB_URI="${MONGODB_URI}" TOPOLOGY="${TOPOLOGY}" COMPRESSOR="${COMPRESSOR}" JAVA_VERSION="${JAVA_VERSION}" SLOW_TESTS_ONLY=true .evergreen/run-tests.sh
351+
AUTH="${AUTH}" SSL="${SSL}" MONGODB_URI="${MONGODB_URI}" TOPOLOGY="${TOPOLOGY}" COMPRESSOR="${COMPRESSOR}" JDK="${JDK}" SLOW_TESTS_ONLY=true .evergreen/run-tests.sh
352352
353353
"run scala tests":
354354
- command: shell.exec
@@ -357,7 +357,7 @@ functions:
357357
working_dir: "src"
358358
script: |
359359
${PREPARE_SHELL}
360-
SCALA="${SCALA}" AUTH="${AUTH}" SSL="${SSL}" MONGODB_URI="${MONGODB_URI}" SAFE_FOR_MULTI_MONGOS="${SAFE_FOR_MULTI_MONGOS}" TOPOLOGY="${TOPOLOGY}" JAVA_VERSION="${JAVA_VERSION}" .evergreen/run-scala-tests.sh
360+
SCALA="${SCALA}" AUTH="${AUTH}" SSL="${SSL}" MONGODB_URI="${MONGODB_URI}" SAFE_FOR_MULTI_MONGOS="${SAFE_FOR_MULTI_MONGOS}" TOPOLOGY="${TOPOLOGY}" JDK="${JDK}" .evergreen/run-scala-tests.sh
361361
362362
"run socket tests":
363363
- command: shell.exec
@@ -366,7 +366,7 @@ functions:
366366
working_dir: "src"
367367
script: |
368368
${PREPARE_SHELL}
369-
AUTH="${AUTH}" MONGODB_URI="${MONGODB_URI}" TOPOLOGY="${TOPOLOGY}" COMPRESSOR="${COMPRESSOR}" JAVA_VERSION="${JAVA_VERSION}" .evergreen/run-socket-tests.sh
369+
AUTH="${AUTH}" MONGODB_URI="${MONGODB_URI}" TOPOLOGY="${TOPOLOGY}" COMPRESSOR="${COMPRESSOR}" JDK="${JDK}" .evergreen/run-socket-tests.sh
370370
371371
"run netty tests":
372372
- command: shell.exec
@@ -375,7 +375,7 @@ functions:
375375
working_dir: "src"
376376
script: |
377377
${PREPARE_SHELL}
378-
STREAM_TYPE="netty" AUTH="${AUTH}" SSL="${SSL}" NETTY_SSL_PROVIDER="${NETTY_SSL_PROVIDER}" MONGODB_URI="${MONGODB_URI}" TOPOLOGY="${TOPOLOGY}" COMPRESSOR="${COMPRESSOR}" JAVA_VERSION="${JAVA_VERSION}" .evergreen/run-tests.sh
378+
STREAM_TYPE="netty" AUTH="${AUTH}" SSL="${SSL}" NETTY_SSL_PROVIDER="${NETTY_SSL_PROVIDER}" MONGODB_URI="${MONGODB_URI}" TOPOLOGY="${TOPOLOGY}" COMPRESSOR="${COMPRESSOR}" JDK="${JDK}" .evergreen/run-tests.sh
379379
380380
"run plain auth test":
381381
- command: shell.exec
@@ -385,7 +385,7 @@ functions:
385385
working_dir: "src"
386386
script: |
387387
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
388-
JAVA_VERSION="8" MONGODB_URI="${plain_auth_mongodb_uri}" .evergreen/run-plain-auth-test.sh
388+
JDK="jdk8" MONGODB_URI="${plain_auth_mongodb_uri}" .evergreen/run-plain-auth-test.sh
389389
390390
"add aws auth variables to file":
391391
- command: shell.exec
@@ -437,7 +437,7 @@ functions:
437437
PASS=$(urlencode ${iam_auth_ecs_secret_access_key})
438438
MONGODB_URI="mongodb://$USER:$PASS@localhost"
439439
EOF
440-
JAVA_VERSION=${JAVA_VERSION} PROJECT_DIRECTORY=${PROJECT_DIRECTORY} .evergreen/run-mongodb-aws-test.sh
440+
JDK=${JDK} PROJECT_DIRECTORY=${PROJECT_DIRECTORY} .evergreen/run-mongodb-aws-test.sh
441441
442442
"run aws auth test with assume role credentials":
443443
- command: shell.exec
@@ -466,7 +466,7 @@ functions:
466466
SESSION_TOKEN=$(urlencode $SESSION_TOKEN)
467467
MONGODB_URI="mongodb://$USER:$PASS@localhost"
468468
EOF
469-
JAVA_VERSION=${JAVA_VERSION} PROJECT_DIRECTORY=${PROJECT_DIRECTORY} DRIVERS_TOOLS=${DRIVERS_TOOLS} .evergreen/run-mongodb-aws-test.sh
469+
JDK=${JDK} PROJECT_DIRECTORY=${PROJECT_DIRECTORY} DRIVERS_TOOLS=${DRIVERS_TOOLS} .evergreen/run-mongodb-aws-test.sh
470470
471471
"run aws auth test with aws EC2 credentials":
472472
- command: shell.exec
@@ -484,7 +484,7 @@ functions:
484484
working_dir: "src"
485485
script: |
486486
${PREPARE_SHELL}
487-
JAVA_VERSION=${JAVA_VERSION} .evergreen/run-mongodb-aws-test.sh
487+
JDK=${JDK} .evergreen/run-mongodb-aws-test.sh
488488
489489
"run aws auth test with aws credentials as environment variables":
490490
- command: shell.exec
@@ -504,7 +504,7 @@ functions:
504504
working_dir: "src"
505505
script: |
506506
${PREPARE_SHELL}
507-
JAVA_VERSION=${JAVA_VERSION} .evergreen/run-mongodb-aws-test.sh
507+
JDK=${JDK} .evergreen/run-mongodb-aws-test.sh
508508
509509
"run aws auth test with aws credentials and session token as environment variables":
510510
- command: shell.exec
@@ -525,7 +525,7 @@ functions:
525525
working_dir: "src"
526526
script: |
527527
${PREPARE_SHELL}
528-
JAVA_VERSION=${JAVA_VERSION} .evergreen/run-mongodb-aws-test.sh
528+
JDK=${JDK} .evergreen/run-mongodb-aws-test.sh
529529
530530
"run aws ECS auth test":
531531
- command: shell.exec
@@ -551,7 +551,7 @@ functions:
551551
working_dir: "src"
552552
script: |
553553
${PREPARE_SHELL}
554-
JAVA_VERSION=${JAVA_VERSION} .evergreen/run-atlas-data-lake-test.sh
554+
JDK=${JDK} .evergreen/run-atlas-data-lake-test.sh
555555
556556
"run-ocsp-test":
557557
- command: shell.exec
@@ -563,7 +563,7 @@ functions:
563563
CA_FILE="$DRIVERS_TOOLS/.evergreen/ocsp/${OCSP_ALGORITHM}/ca.pem" \
564564
OCSP_TLS_SHOULD_SUCCEED="${OCSP_TLS_SHOULD_SUCCEED}" \
565565
OCSP_MUST_STAPLE="${OCSP_MUST_STAPLE}" \
566-
JAVA_VERSION="${JAVA_VERSION}" \
566+
JDK="${JDK}" \
567567
sh ${PROJECT_DIRECTORY}/.evergreen/run-ocsp-test.sh
568568
569569
"run-valid-ocsp-server-ca-responder":
@@ -650,7 +650,7 @@ functions:
650650
working_dir: "src"
651651
script: |
652652
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
653-
PROJECT_DIRECTORY=${PROJECT_DIRECTORY} JAVA_VERSION=${JAVA_VERSION} MONGODB_URI=${gssapi_auth_mongodb_uri} KDC=${gssapi_auth_kdc} REALM=${gssapi_auth_realm} KEYTAB_BASE64=${gssapi_auth_keytab_base64} .evergreen/run-gssapi-auth-test.sh
653+
PROJECT_DIRECTORY=${PROJECT_DIRECTORY} JDK=${JDK} MONGODB_URI=${gssapi_auth_mongodb_uri} KDC=${gssapi_auth_kdc} REALM=${gssapi_auth_realm} KEYTAB_BASE64=${gssapi_auth_keytab_base64} .evergreen/run-gssapi-auth-test.sh
654654
655655
"run mmapv1 storage test":
656656
- command: shell.exec
@@ -660,7 +660,7 @@ functions:
660660
working_dir: "src"
661661
script: |
662662
${PREPARE_SHELL}
663-
PROJECT_DIRECTORY=${PROJECT_DIRECTORY} JAVA_VERSION=${JAVA_VERSION} TOPOLOGY=${TOPOLOGY} STORAGE_ENGINE=${STORAGE_ENGINE} MONGODB_URI="${MONGODB_URI}" .evergreen/run-mmapv1-storage-test.sh
663+
PROJECT_DIRECTORY=${PROJECT_DIRECTORY} JDK=${JDK} TOPOLOGY=${TOPOLOGY} STORAGE_ENGINE=${STORAGE_ENGINE} MONGODB_URI="${MONGODB_URI}" .evergreen/run-mmapv1-storage-test.sh
664664
665665
"run atlas test":
666666
- command: shell.exec
@@ -671,7 +671,7 @@ functions:
671671
script: |
672672
# DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
673673
# The connection strings are pipe-delimited
674-
JAVA_VERSION="8" \
674+
JDK="jdk8" \
675675
MONGODB_URIS="${atlas_free_tier_uri}|${atlas_replica_set_uri}|${atlas_sharded_uri}|${atlas_tls_v11_uri}|${atlas_tls_v12_uri}|${atlas_free_tier_uri_srv}|${atlas_replica_set_uri_srv}|${atlas_sharded_uri_srv}|${atlas_tls_v11_uri_srv}|${atlas_tls_v12_uri_srv}|${atlas_serverless_uri}|${atlas_serverless_uri_srv}" \
676676
.evergreen/run-connectivity-tests.sh
677677
@@ -1507,15 +1507,15 @@ axes:
15071507
- id: "jdk17"
15081508
display_name: JDK17
15091509
variables:
1510-
JAVA_VERSION: "17"
1510+
JDK: "jdk17"
15111511
- id: "jdk11"
15121512
display_name: JDK11
15131513
variables:
1514-
JAVA_VERSION: "11"
1514+
JDK: "jdk11"
15151515
- id: "jdk8"
15161516
display_name: JDK8
15171517
variables:
1518-
JAVA_VERSION: "8"
1518+
JDK: "jdk8"
15191519

15201520
- id: scala
15211521
display_name: SCALA

‎.evergreen/compile.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ set -o errexit # Exit the script with error if any of the commands fail
66
############################################
77
# Main Program #
88
############################################
9-
source "${BASH_SOURCE%/*}/javaConfig.bash"
109

11-
echo "Compiling java driver"
10+
echo "Compiling java driver with jdk11"
1211

12+
# We always compile with the latest version of java
13+
export JAVA_HOME="/opt/java/jdk11"
1314
./gradlew -version
14-
./gradlew -PxmlReports.enabled=true --info -x test -x integrationTest clean check jar testClasses docs
15+
./gradlew -PjdkHome=/opt/java/jdk17 -PxmlReports.enabled=true --info -x test -x integrationTest clean check jar testClasses docs

‎.evergreen/javaConfig.bash

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎.evergreen/publish.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,23 @@ set -o errexit # Exit the script with error if any of the commands fail
77
############################################
88
# Main Program #
99
############################################
10-
source "${BASH_SOURCE%/*}/javaConfig.bash"
11-
1210
RELEASE=${RELEASE:false}
1311

1412
export ORG_GRADLE_PROJECT_nexusUsername=${NEXUS_USERNAME}
1513
export ORG_GRADLE_PROJECT_nexusPassword=${NEXUS_PASSWORD}
1614
export ORG_GRADLE_PROJECT_signingKey="${SIGNING_KEY}"
1715
export ORG_GRADLE_PROJECT_signingPassword=${SIGNING_PASSWORD}
1816

17+
echo "Publishing snapshot with jdk11"
18+
export JAVA_HOME="/opt/java/jdk11"
19+
1920
if [ "$RELEASE" == "true" ]; then
2021
TASK="publishArchives"
2122
else
2223
TASK="publishSnapshots"
2324
fi
2425

25-
SYSTEM_PROPERTIES="-Dorg.gradle.internal.publish.checksums.insecure=true -Dorg.gradle.internal.http.connectionTimeout=120000 -Dorg.gradle.internal.http.socketTimeout=120000"
26+
SYSTEM_PROPERTIES="-PjdkHome=/opt/java/jdk17 -Dorg.gradle.internal.publish.checksums.insecure=true -Dorg.gradle.internal.http.connectionTimeout=120000 -Dorg.gradle.internal.http.socketTimeout=120000"
2627

2728
./gradlew -version
2829
./gradlew ${SYSTEM_PROPERTIES} --stacktrace --info ${TASK}

‎.evergreen/run-atlas-data-lake-test.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,21 @@ set -o errexit # Exit the script with error if any of the commands fail
77
# JDK Set the version of java to be used. Java versions can be set from the java toolchain /opt/java
88
# "jdk5", "jdk6", "jdk7", "jdk8", "jdk9", "jdk11"
99

10+
JDK=${JDK:-jdk11}
11+
1012
############################################
1113
# Main Program #
1214
############################################
13-
source "${BASH_SOURCE%/*}/javaConfig.bash"
1415

1516
echo "Running Atlas Data Lake driver tests"
1617

18+
export JAVA_HOME="/opt/java/${JDK}"
19+
1720
# show test output
1821
set -x
1922

2023
DATA_LAKE_URI="mongodb://mhuser:pencil@localhost"
2124

22-
echo "Running Atlas Data Lake tests with Java ${JAVA_VERSION}"
25+
echo "Running Atlas Data Lake tests with ${JDK}"
2326
./gradlew -version
24-
./gradlew -PjavaVersion=${JAVA_VERSION} -Dorg.mongodb.test.data.lake=true -Dorg.mongodb.test.uri=${DATA_LAKE_URI} \
25-
--info driver-sync:test --tests AtlasDataLake*Test
27+
./gradlew -PjdkHome=${JAVA_HOME} -Dorg.mongodb.test.data.lake=true -Dorg.mongodb.test.uri=${DATA_LAKE_URI} --info driver-sync:test --tests AtlasDataLake*Test

‎.evergreen/run-connectivity-tests.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@ set -o errexit
99
# Support arguments:
1010
# Pass as many MongoDB URIS as arguments to this script as required
1111

12+
JDK=${JDK:-jdk8}
13+
1214
############################################
1315
# Main Program #
1416
############################################
15-
source "${BASH_SOURCE%/*}/javaConfig.bash"
1617

17-
echo "Running connectivity tests with Java ${JAVA_VERSION}"
18+
echo "Running connectivity tests with ${JDK}"
19+
20+
export JAVA_HOME="/opt/java/jdk11"
1821

19-
./gradlew -PjavaVersion=${JAVA_VERSION} -Dorg.mongodb.test.connectivity.uris="${MONGODB_URIS}" --info --continue \
22+
./gradlew -PjdkHome=/opt/java/${JDK} -Dorg.mongodb.test.connectivity.uris="${MONGODB_URIS}" --info --continue \
2023
driver-sync:test --tests ConnectivityTest \
2124
driver-legacy:test --tests ConnectivityTest \
2225
driver-reactive-streams:test --tests ConnectivityTest

‎.evergreen/run-gssapi-auth-test.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ set -o errexit # Exit the script with error if any of the commands fail
1212
# KEYTAB_BASE64 The BASE64-encoded keytab
1313
# PROJECT_DIRECTORY The project directory
1414

15+
JDK=${JDK:-jdk8}
16+
1517
############################################
1618
# Main Program #
1719
############################################
18-
source "${BASH_SOURCE%/*}/javaConfig.bash"
1920

2021
echo "Running GSSAPI authentication tests"
2122

@@ -30,9 +31,13 @@ com.sun.security.jgss.krb5.initiate {
3031
};
3132
EOF
3233

33-
echo "Running tests with Java ${JAVA_VERSION}"
34+
echo "Compiling java driver with jdk11"
35+
36+
export JAVA_HOME="/opt/java/jdk11"
37+
38+
echo "Running tests with ${JDK}"
3439
./gradlew -version
35-
./gradlew -PjavaVersion=${JAVA_VERSION} --stacktrace --info \
40+
./gradlew -PjdkHome=/opt/java/${JDK} --stacktrace --info \
3641
-Dorg.mongodb.test.uri=${MONGODB_URI} \
3742
-Pgssapi.enabled=true -Psun.security.krb5.debug=true -Pauth.login.config=file://${PROJECT_DIRECTORY}/.evergreen/java.login.drivers.config \
3843
-Pkrb5.kdc=${KDC} -Pkrb5.realm=${REALM} -Psun.security.krb5.debug=true \

‎.evergreen/run-kms-tls-tests.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ set -o errexit # Exit the script with error if any of the commands fail
1010
############################################
1111
# Main Program #
1212
############################################
13-
source "${BASH_SOURCE%/*}/javaConfig.bash"
13+
1414
echo "Running KMS TLS tests"
1515

16+
export JAVA_HOME="/opt/java/jdk11"
17+
1618
cp ${JAVA_HOME}/lib/security/cacerts mongo-truststore
1719
${JAVA_HOME}/bin/keytool -importcert -trustcacerts -file ${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem -keystore mongo-truststore -storepass changeit -storetype JKS -noprompt
1820

‎.evergreen/run-load-balancer-tests.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ set -o errexit # Exit the script with error if any of the commands fail
1313
AUTH=${AUTH:-noauth}
1414
SSL=${SSL:-nossl}
1515
MONGODB_URI=${MONGODB_URI:-}
16+
JDK=${JDK:-jdk8}
17+
18+
export JAVA_HOME="/opt/java/jdk11"
1619

1720
############################################
1821
# Main Program #
1922
############################################
20-
source "${BASH_SOURCE%/*}/javaConfig.bash"
2123

2224
if [ "$SSL" != "nossl" ]; then
2325
# We generate the keystore and truststore on every run with the certs in the drivers-tools repo
@@ -36,15 +38,15 @@ fi
3638

3739
echo "Running $AUTH tests over $SSL and connecting to $SINGLE_MONGOS_LB_URI"
3840

39-
echo "Running tests with Java ${JAVA_VERSION}"
41+
echo "Running tests with ${JDK}"
4042
./gradlew -version
4143

4244
# Disabling errexit so that both gradle command will run.
4345
# Then we exit with non-zero if either of them exited with non-zero
4446

4547
set +o errexit
4648

47-
./gradlew -PjavaVersion=${JAVA_VERSION} \
49+
./gradlew -PjdkHome=/opt/java/${JDK} \
4850
-Dorg.mongodb.test.uri=${SINGLE_MONGOS_LB_URI} \
4951
-Dorg.mongodb.test.multi.mongos.uri=${MULTI_MONGOS_LB_URI} \
5052
${GRADLE_EXTRA_VARS} --stacktrace --info --continue driver-sync:test \
@@ -59,7 +61,7 @@ set +o errexit
5961
first=$?
6062
echo $first
6163

62-
./gradlew -PjavaVersion=${JAVA_VERSION} \
64+
./gradlew -PjdkHome=/opt/java/${JDK} \
6365
-Dorg.mongodb.test.uri=${SINGLE_MONGOS_LB_URI} \
6466
-Dorg.mongodb.test.multi.mongos.uri=${MULTI_MONGOS_LB_URI} \
6567
${GRADLE_EXTRA_VARS} --stacktrace --info --continue driver-reactive-stream:test \
@@ -74,7 +76,7 @@ echo $first
7476
second=$?
7577
echo $second
7678

77-
./gradlew -PjavaVersion=${JAVA_VERSION} \
79+
./gradlew -PjdkHome=/opt/java/${JDK} \
7880
-Dorg.mongodb.test.uri=${SINGLE_MONGOS_LB_URI} \
7981
-Dorg.mongodb.test.multi.mongos.uri=${MULTI_MONGOS_LB_URI} \
8082
${GRADLE_EXTRA_VARS} --stacktrace --info --continue driver-core:test \

0 commit comments

Comments
 (0)