diff --git a/.evergreen/config_generator/components/funcs/test_atlas_connectivity.py b/.evergreen/config_generator/components/funcs/test_atlas_connectivity.py deleted file mode 100644 index 9fffb7b81a..0000000000 --- a/.evergreen/config_generator/components/funcs/test_atlas_connectivity.py +++ /dev/null @@ -1,33 +0,0 @@ -from shrub.v3.evg_command import EvgCommandType - -from config_generator.etc.function import Function -from config_generator.etc.utils import bash_exec - - -class TestAtlasConnectivity(Function): - name = 'test atlas connectivity' - commands = bash_exec( - command_type=EvgCommandType.TEST, - silent=True, - working_dir='mongo-cxx-driver', - script="""\ - export MONGOC_INSTALL_PREFIX=$(pwd)/../mongoc - export MONGOCXX_INSTALL_PREFIX=$(pwd)/build/install - if [[ "${distro_id}" == rhel* ]]; then - export LIB_DIR=lib64 - else - export LIB_DIR=lib - fi - export BUILD_TYPE=${build_type} - export BUILD_DIR=$(pwd)/build - - # The atlas_serverless_uri expansion is set in the Evergreen project settings. - export URI="${atlas_serverless_uri}" - - ./.evergreen/scripts/connect.sh - """, - ) - - -def functions(): - return TestAtlasConnectivity.defn() diff --git a/.evergreen/config_generator/components/funcs/test_auth.py b/.evergreen/config_generator/components/funcs/test_auth.py deleted file mode 100644 index be1d5bbd87..0000000000 --- a/.evergreen/config_generator/components/funcs/test_auth.py +++ /dev/null @@ -1,29 +0,0 @@ -from shrub.v3.evg_command import EvgCommandType - -from config_generator.etc.function import Function -from config_generator.etc.utils import bash_exec - - -class TestAuth(Function): - name = 'test auth' - commands = bash_exec( - command_type=EvgCommandType.TEST, - working_dir='mongo-cxx-driver', - script="""\ - export MONGOC_INSTALL_PREFIX=$(pwd)/../mongoc - export MONGOCXX_INSTALL_PREFIX=$(pwd)/build/install - if [[ "${distro_id}" == rhel* ]]; then - export LIB_DIR=lib64 - else - export LIB_DIR=lib - fi - export BUILD_TYPE=${build_type} - export BUILD_DIR=$(pwd)/build - export URI="mongodb://bob:pwd123@localhost" - ./.evergreen/scripts/connect.sh - """, - ) - - -def functions(): - return TestAuth.defn() diff --git a/.evergreen/generated_configs/functions.yml b/.evergreen/generated_configs/functions.yml index 330a945304..1796ac97ba 100644 --- a/.evergreen/generated_configs/functions.yml +++ b/.evergreen/generated_configs/functions.yml @@ -688,50 +688,6 @@ functions: args: - -c - .evergreen/scripts/test.sh - test atlas connectivity: - command: subprocess.exec - type: test - params: - binary: bash - working_dir: mongo-cxx-driver - silent: true - args: - - -c - - | - export MONGOC_INSTALL_PREFIX=$(pwd)/../mongoc - export MONGOCXX_INSTALL_PREFIX=$(pwd)/build/install - if [[ "${distro_id}" == rhel* ]]; then - export LIB_DIR=lib64 - else - export LIB_DIR=lib - fi - export BUILD_TYPE=${build_type} - export BUILD_DIR=$(pwd)/build - - # The atlas_serverless_uri expansion is set in the Evergreen project settings. - export URI="${atlas_serverless_uri}" - - ./.evergreen/scripts/connect.sh - test auth: - command: subprocess.exec - type: test - params: - binary: bash - working_dir: mongo-cxx-driver - args: - - -c - - | - export MONGOC_INSTALL_PREFIX=$(pwd)/../mongoc - export MONGOCXX_INSTALL_PREFIX=$(pwd)/build/install - if [[ "${distro_id}" == rhel* ]]; then - export LIB_DIR=lib64 - else - export LIB_DIR=lib - fi - export BUILD_TYPE=${build_type} - export BUILD_DIR=$(pwd)/build - export URI="mongodb://bob:pwd123@localhost" - ./.evergreen/scripts/connect.sh test-search-index-helpers: command: subprocess.exec type: test diff --git a/.evergreen/scripts/connect.sh b/.evergreen/scripts/connect.sh deleted file mode 100755 index 704b8ddb9d..0000000000 --- a/.evergreen/scripts/connect.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail - -LIB_DIR=${LIB_DIR:-"lib"} -BUILD_TYPE=${BUILD_TYPE:-"Debug"} - -print_usage_and_exit() { - echo "Error: $1" - cat <