Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DRIVERS-2328: Skip installing the legacy shell by default #366

Merged
merged 1 commit into from
Nov 29, 2023
Merged

DRIVERS-2328: Skip installing the legacy shell by default #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .evergreen/docker/ubuntu20.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 1 addition & 8 deletions .evergreen/download-mongodb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions .evergreen/run-orchestration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand Down
Loading