PYTHON-5134 Fix binary installation and remove unused scripts (#2146)
This commit is contained in:
parent
338b7dcd49
commit
3e2967147e
@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -o xtrace
|
||||
mkdir out_dir
|
||||
# shellcheck disable=SC2156
|
||||
find "$MONGO_ORCHESTRATION_HOME" -name \*.log -exec sh -c 'x="{}"; mv $x $PWD/out_dir/$(basename $(dirname $x))_$(basename $x)' \;
|
||||
tar zcvf mongodb-logs.tar.gz -C out_dir/ .
|
||||
rm -rf out_dir
|
||||
@ -17,6 +17,7 @@ CARGO_HOME=${CARGO_HOME:-${DRIVERS_TOOLS}/.cargo}
|
||||
UV_TOOL_DIR=$PROJECT_DIRECTORY/.local/uv/tools
|
||||
UV_CACHE_DIR=$PROJECT_DIRECTORY/.local/uv/cache
|
||||
DRIVERS_TOOLS_BINARIES="$DRIVERS_TOOLS/.bin"
|
||||
MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
|
||||
|
||||
# On Evergreen jobs, "CI" will be set, and we don't want to write to $HOME.
|
||||
if [ "${CI:-}" == "true" ]; then
|
||||
@ -26,6 +27,8 @@ else
|
||||
PYMONGO_BIN_DIR=$HOME/cli_bin
|
||||
fi
|
||||
|
||||
PATH_EXT="$MONGODB_BINARIES:$DRIVERS_TOOLS_BINARIES:$PYMONGO_BIN_DIR:\$PATH"
|
||||
|
||||
# Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory
|
||||
if [ "Windows_NT" = "${OS:-}" ]; then # Magic variable in cygwin
|
||||
DRIVERS_TOOLS=$(cygpath -m $DRIVERS_TOOLS)
|
||||
@ -34,6 +37,7 @@ if [ "Windows_NT" = "${OS:-}" ]; then # Magic variable in cygwin
|
||||
UV_TOOL_DIR=$(cygpath -m "$UV_TOOL_DIR")
|
||||
UV_CACHE_DIR=$(cygpath -m "$UV_CACHE_DIR")
|
||||
DRIVERS_TOOLS_BINARIES=$(cygpath -m "$DRIVERS_TOOLS_BINARIES")
|
||||
MONGODB_BINARIES=$(cygpath -m "$MONGODB_BINARIES")
|
||||
PYMONGO_BIN_DIR=$(cygpath -m "$PYMONGO_BIN_DIR")
|
||||
fi
|
||||
|
||||
@ -73,17 +77,28 @@ export skip_web_identity_auth_test="${skip_web_identity_auth_test:-}"
|
||||
export skip_ECS_auth_test="${skip_ECS_auth_test:-}"
|
||||
|
||||
export CARGO_HOME="$CARGO_HOME"
|
||||
export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
|
||||
export UV_TOOL_DIR="$UV_TOOL_DIR"
|
||||
export UV_CACHE_DIR="$UV_CACHE_DIR"
|
||||
export UV_TOOL_BIN_DIR="$DRIVERS_TOOLS_BINARIES"
|
||||
export PYMONGO_BIN_DIR="$PYMONGO_BIN_DIR"
|
||||
export PATH="$MONGODB_BINARIES:$DRIVERS_TOOLS_BINARIES:$PYMONGO_BIN_DIR:$PATH"
|
||||
export PATH="$PATH_EXT"
|
||||
# shellcheck disable=SC2154
|
||||
export PROJECT="${project:-mongo-python-driver}"
|
||||
export PIP_QUIET=1
|
||||
EOT
|
||||
|
||||
# Write the .env file for drivers-tools.
|
||||
rm -rf $DRIVERS_TOOLS
|
||||
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
|
||||
|
||||
cat <<EOT > ${DRIVERS_TOOLS}/.env
|
||||
SKIP_LEGACY_SHELL=1
|
||||
DRIVERS_TOOLS="$DRIVERS_TOOLS"
|
||||
MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
|
||||
MONGODB_BINARIES="$MONGODB_BINARIES"
|
||||
TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
|
||||
EOT
|
||||
|
||||
# Skip CSOT tests on non-linux platforms.
|
||||
if [ "$(uname -s)" != "Linux" ]; then
|
||||
echo "export SKIP_CSOT_TESTS=1" >> $SCRIPT_DIR/env.sh
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set +x
|
||||
. src/.evergreen/scripts/env.sh
|
||||
# shellcheck disable=SC2044
|
||||
for filename in $(find $DRIVERS_TOOLS -name \*.json); do
|
||||
perl -p -i -e "s|ABSOLUTE_PATH_REPLACEMENT_TOKEN|$DRIVERS_TOOLS|g" $filename
|
||||
done
|
||||
@ -1,5 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set +x
|
||||
. src/.evergreen/scripts/env.sh
|
||||
echo '{"results": [{ "status": "FAIL", "test_file": "Build", "log_raw": "No test-results.json found was created" } ]}' >$PROJECT_DIRECTORY/test-results.json
|
||||
@ -18,10 +18,17 @@ function _pip_install() {
|
||||
_HERE=$(dirname ${BASH_SOURCE:-$0})
|
||||
. $_HERE/../utils.sh
|
||||
_VENV_PATH=$(mktemp -d)
|
||||
if [ "Windows_NT" = "${OS:-}" ]; then
|
||||
_VENV_PATH=$(cygpath -m $_VENV_PATH)
|
||||
fi
|
||||
echo "Installing $2 using pip..."
|
||||
createvirtualenv "$(find_python3)" $_VENV_PATH
|
||||
python -m pip install $1
|
||||
ln -s "$(which $2)" $_BIN_DIR/$2
|
||||
if [ "Windows_NT" = "${OS:-}" ]; then
|
||||
ln -s "$(which $2)" $_BIN_DIR/$2.exe
|
||||
else
|
||||
ln -s "$(which $2)" $_BIN_DIR/$2
|
||||
fi
|
||||
echo "Installed to ${_BIN_DIR}"
|
||||
echo "Installing $2 using pip... done."
|
||||
}
|
||||
@ -49,6 +56,9 @@ if ! command -v uv 2>/dev/null; then
|
||||
curl -LsSf https://astral.sh/uv/install.sh | env UV_INSTALL_DIR="$_BIN_DIR" INSTALLER_NO_MODIFY_PATH=1 sh || {
|
||||
_pip_install uv uv
|
||||
}
|
||||
if [ "Windows_NT" = "${OS:-}" ]; then
|
||||
chmod +x "$(cygpath -u $_BIN_DIR)/uv.exe"
|
||||
fi
|
||||
echo "Installing uv... done."
|
||||
fi
|
||||
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set +x
|
||||
. src/.evergreen/scripts/env.sh
|
||||
# shellcheck disable=SC2044
|
||||
for i in $(find "$DRIVERS_TOOLS"/.evergreen "$PROJECT_DIRECTORY"/.evergreen -name \*.sh); do
|
||||
chmod +x "$i"
|
||||
done
|
||||
@ -5,10 +5,6 @@ HERE=$(dirname ${BASH_SOURCE:-$0})
|
||||
pushd $HERE
|
||||
. env.sh
|
||||
|
||||
rm -rf $DRIVERS_TOOLS
|
||||
git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
|
||||
echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" >$MONGO_ORCHESTRATION_HOME/orchestration.config
|
||||
|
||||
popd
|
||||
|
||||
# Copy PyMongo's test certificates over driver-evergreen-tools'
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -eu
|
||||
set -eux
|
||||
|
||||
HERE=$(dirname ${BASH_SOURCE:-$0})
|
||||
pushd "$(dirname "$(dirname $HERE)")" > /dev/null
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set +x
|
||||
. src/.evergreen/scripts/env.sh
|
||||
# shellcheck disable=SC2044
|
||||
for i in $(find "$DRIVERS_TOOLS"/.evergreen "$PROJECT_DIRECTORY"/.evergreen -name \*.sh); do
|
||||
< "$i" tr -d '\r' >"$i".new
|
||||
mv "$i".new "$i"
|
||||
done
|
||||
# Copy client certificate because symlinks do not work on Windows.
|
||||
cp "$DRIVERS_TOOLS"/.evergreen/x509gen/client.pem "$MONGO_ORCHESTRATION_HOME"/lib/client.pem
|
||||
Loading…
Reference in New Issue
Block a user