diff --git a/.evergreen/docker/ubuntu20.04/Dockerfile b/.evergreen/docker/ubuntu20.04/Dockerfile index 60564492..cce442e3 100644 --- a/.evergreen/docker/ubuntu20.04/Dockerfile +++ b/.evergreen/docker/ubuntu20.04/Dockerfile @@ -25,7 +25,6 @@ ENV PROJECT_ORCHESTRATION_HOME=/root/drivers-evergreen-tools/.evergreen/orchestr ENV MONGODB_BINARIES=/root/mongodb/bin ENV MONGODB_BINARY_ROOT=/root ENV MONGO_ORCHESTRATION_HOME=/root -ENV SKIP_LEGACY_SHELL=1 ENV DOCKER_RUNNING=true COPY ./local-entrypoint.sh /root/local-entrypoint.sh diff --git a/.evergreen/download-mongodb.sh b/.evergreen/download-mongodb.sh index a2cc8aaa..8f4bdef4 100755 --- a/.evergreen/download-mongodb.sh +++ b/.evergreen/download-mongodb.sh @@ -735,14 +735,7 @@ download_and_extract () download_and_extract_mongosh "$MONGOSH_DOWNLOAD_URL" "$EXTRACT_MONGOSH" fi - # Deprecated: this will be removed once drivers have updated to mongosh. - # Ubunutu 22 does not support the legacy shell. - case "$DISTRO" in - linux-ubuntu-22.04*) SKIP_LEGACY_SHELL=1 - ;; - esac - - if [ -z "${SKIP_LEGACY_SHELL:-}" -a ! -e $DRIVERS_TOOLS/mongodb/bin/mongo -a ! -e $DRIVERS_TOOLS/mongodb/bin/mongo.exe ]; then + if [ ! -z "${INSTALL_LEGACY_SHELL:-}" -a ! -e $DRIVERS_TOOLS/mongodb/bin/mongo -a ! -e $DRIVERS_TOOLS/mongodb/bin/mongo.exe ]; then # The legacy mongo shell is not included in server downloads of 6.0.0-rc6 or later. Refer: SERVER-64352. # Some test scripts use the mongo shell for setup. # Download 5.0 package to get the legacy mongo shell as a workaround until DRIVERS-2328 is addressed. diff --git a/.evergreen/run-orchestration.sh b/.evergreen/run-orchestration.sh index 16e2739d..eea42248 100755 --- a/.evergreen/run-orchestration.sh +++ b/.evergreen/run-orchestration.sh @@ -24,6 +24,7 @@ DISABLE_TEST_COMMANDS=${DISABLE_TEST_COMMANDS} MONGODB_VERSION=${MONGODB_VERSION:-latest} MONGODB_DOWNLOAD_URL=${MONGODB_DOWNLOAD_URL} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} +INSTALL_LEGACY_SHELL=${INSTALL_LEGACY_SHELLL:-} DL_START=$(date +%s) DIR=$(dirname $0) diff --git a/action.yml b/action.yml index cd1824fd..280f3af8 100644 --- a/action.yml +++ b/action.yml @@ -20,7 +20,10 @@ inputs: description: "Whether to start the server with requireApiVersion enabled (defaults to false)" required: false skip-legacy-shell: - description: "Whether to skip installing the legacy shell for 6.0+ servers" + description: "Whether to skip installing the legacy shell for 6.0+ servers (deprecated)" + required: false + install-legacy-shell: + description: "Whether to install the legacy shell for 6.0+ servers" required: false outputs: cluster-uri: @@ -52,6 +55,7 @@ runs: STORAGE_ENGINE: ${{ inputs.storage-engine }} REQUIRE_API_VERSION: ${{ inputs.require-api-version }} SKIP_LEGACY_SHELL: ${{ inputs.skip-legacy-shell }} + INSTALL_LEGACY_SHELL: ${{ inputs.install-legacy-shell }} shell: bash - id: "get-cluster-uri" name: "Expose Cluster URI"