Merge branch 'mongodb:main' into main

Author: nhachicha

.evergreen/.evg.yml

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -o xtrace   # Write all commands first to stderr
+set -o errexit  # Exit the script with error if any of the commands fail
+
+############################################
+#            Main Program                  #
+############################################
+RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE[0]:-$0}")"
+. "${RELATIVE_DIR_PATH}/setup-env.bash"
+
+echo "Enable caching"
+echo "org.gradle.caching=true" >> gradle.properties
+echo "kotlin.caching.enabled=true" >> gradle.properties
+
+echo "Compiling JVM drivers"
+./gradlew -version
+./gradlew classes --parallel
+
+# Copy the Gradle dependency cache to the gradle read only dependency cache directory.
+if [ -n "$GRADLE_RO_DEP_CACHE" ];then
+  echo "Copying Gradle dependency cache to $GRADLE_RO_DEP_CACHE"
+  mkdir -p $GRADLE_RO_DEP_CACHE
+
+  # https://docs.gradle.org/current/userguide/dependency_caching.html#sec:cache-copy
+  # Gradle suggests removing the "*.lock" files and the `gc.properties` file for saving/restoring cache
+  cp -r $HOME/.gradle/caches/modules-2 "$GRADLE_RO_DEP_CACHE"
+  find "$GRADLE_RO_DEP_CACHE" -name "*.lock" -type f | xargs rm -f
+  find "$GRADLE_RO_DEP_CACHE" -name "gc.properties" -type f | xargs rm -f
+
+  echo "Copied Gradle dependency cache to $GRADLE_RO_DEP_CACHE"
+fi

.evergreen/gradle-cache.sh

@@ -8,7 +8,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 #            Main Program                  #
 ############################################
 RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+. "${RELATIVE_DIR_PATH}/setup-env.bash"
 
 RELEASE=${RELEASE:false}
 
@@ -18,14 +18,14 @@ export ORG_GRADLE_PROJECT_signingKey="${SIGNING_KEY}"
 export ORG_GRADLE_PROJECT_signingPassword=${SIGNING_PASSWORD}
 
 if [ "$RELEASE" == "true" ]; then
-  TASK="publishArchives"
+  TASK="publishArchives closeAndReleaseSonatypeStagingRepository"
 else
   TASK="publishSnapshots"
 fi
 
-SYSTEM_PROPERTIES="-Dorg.gradle.internal.publish.checksums.insecure=true -Dorg.gradle.internal.http.connectionTimeout=120000 -Dorg.gradle.internal.http.socketTimeout=120000"
+SYSTEM_PROPERTIES="-Dorg.gradle.internal.publish.checksums.insecure=true"
 
 ./gradlew -version
-./gradlew ${SYSTEM_PROPERTIES} --stacktrace --info  ${TASK}
-./gradlew ${SYSTEM_PROPERTIES} --stacktrace --info :bson-scala:${TASK} :driver-scala:${TASK} -PdefaultScalaVersions=2.12.12
-./gradlew ${SYSTEM_PROPERTIES} --stacktrace --info :bson-scala:${TASK} :driver-scala:${TASK} -PdefaultScalaVersions=2.11.12
+./gradlew ${SYSTEM_PROPERTIES} --stacktrace --info  ${TASK} # Scala 2.13 is published as result of this gradle execution.
+./gradlew ${SYSTEM_PROPERTIES} --stacktrace --info :bson-scala:${TASK} :driver-scala:${TASK} -PscalaVersion=2.12
+./gradlew ${SYSTEM_PROPERTIES} --stacktrace --info :bson-scala:${TASK} :driver-scala:${TASK} -PscalaVersion=2.11

.evergreen/javaConfig.bash

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Exit the script with error if any of the commands fail
+set -o errexit
+
+# Supported/used environment variables:
+#       JDK                     Set the version of java to be used.  Java versions can be set from the java toolchain /opt/java
+#                               "jdk5", "jdk6", "jdk7", "jdk8", "jdk9"
+# Support arguments:
+#       Pass as many MongoDB URIS as arguments to this script as required
+
+############################################
+#            Main Program                  #
+############################################
+JAVA_VERSION=8
+RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
+. "${RELATIVE_DIR_PATH}/setup-env.bash"
+
+echo "Running connectivity tests with Java ${JAVA_VERSION}"
+
+MONGODB_URIS="${ATLAS_FREE}|${ATLAS_REPL}|${ATLAS_SHRD}|${ATLAS_TLS11}|${ATLAS_TLS12}|${ATLAS_SRV_FREE}|${ATLAS_SRV_REPL}|${ATLAS_SRV_SHRD}|${ATLAS_SRV_TLS11}|${ATLAS_SRV_TLS12}"
+
+./gradlew -PjavaVersion=${JAVA_VERSION} -Dorg.mongodb.test.connectivity.uris="${MONGODB_URIS}" --info --continue \
+ driver-sync:test --tests ConnectivityTest \
+ driver-legacy:test --tests ConnectivityTest \
+ driver-reactive-streams:test --tests ConnectivityTest

.evergreen/publish.sh

@@ -9,7 +9,7 @@ set -o errexit
 #            Main Program                  #
 ############################################
 RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE[0]:-$0}")"
-source "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${RELATIVE_DIR_PATH}/setup-env.bash"
 
 echo "Running Atlas Search tests"
 ./gradlew -version

.evergreen/run-atlas-connectivity-tests.sh

@@ -9,11 +9,14 @@ set -o errexit
 #            Main Program                  #
 ############################################
 RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE[0]:-$0}")"
-source "${RELATIVE_DIR_PATH}/javaConfig.bash"
+source "${RELATIVE_DIR_PATH}/setup-env.bash"
 
 echo "Running Atlas Search tests"
+
 ./gradlew -version
 ./gradlew --stacktrace --info \
     -Dorg.mongodb.test.atlas.search=true \
-    -Dorg.mongodb.test.uri=${MONGODB_URI} \
-    driver-core:test --tests AggregatesSearchIntegrationTest --tests AggregatesVectorSearchIntegrationTest
+    -Dorg.mongodb.test.uri=${ATLAS_SEARCH_URI} \
+    driver-core:test --tests AggregatesSearchIntegrationTest \
+    --tests AggregatesBinaryVectorSearchIntegrationTest \
+    --tests AggregatesSearchTest \

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

@@ -12,7 +12,8 @@ set -o errexit  # Exit the script with error if any of the commands fail
 #            Main Program                  #
 ############################################
 RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE:-$0}")"
-. "${RELATIVE_DIR_PATH}/javaConfig.bash"
+. "${RELATIVE_DIR_PATH}/setup-env.bash"
+
 echo "Running CSFLE AWS from environment tests"
 
 ./gradlew -version
@@ -21,12 +22,12 @@ export AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
 export AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
 
 ./gradlew --stacktrace --info -Dorg.mongodb.test.uri=${MONGODB_URI} \
-    --no-build-cache driver-sync:cleanTest driver-sync:test --tests ClientSideEncryptionAwsCredentialFromEnvironmentTest
+    driver-sync:cleanTest driver-sync:test --tests ClientSideEncryptionAwsCredentialFromEnvironmentTest
 first=$?
 echo $first
 
 ./gradlew --stacktrace --info  -Dorg.mongodb.test.uri=${MONGODB_URI} \
-    --no-build-cache driver-reactive-streams:cleanTest driver-reactive-streams:test --tests ClientSideEncryptionAwsCredentialFromEnvironmentTest
+    driver-reactive-streams:cleanTest driver-reactive-streams:test --tests ClientSideEncryptionAwsCredentialFromEnvironmentTest
 second=$?
 echo $second