mongo 2.19.3 → 2.20.1

data/spec/shared/shlib/distro.sh

@@ -1,74 +0,0 @@
-detected_distro=
-
-host_distro() {
-  if test -z "$detected_distro"; then
-    detected_distro=`_detect_distro`
-  fi
-  echo "$detected_distro"
-}
-
-_detect_distro() {
-  local distro
-  distro=
-  if test -f /etc/debian_version; then
-    # Debian or Ubuntu
-    if test "`uname -m`" = aarch64; then
-      release=`lsb_release -rs |tr -d .`
-      distro="ubuntu$release"-arm
-    elif lsb_release -is |grep -q Debian; then
-      release=`lsb_release -rs |tr -d .`
-      # In docker, release is something like 9.11.
-      # In evergreen, release is 9.2.
-      release=`echo $release |sed -e 's/^9.*/92/'`
-      distro="debian$release"
-    elif lsb_release -is |grep -q Ubuntu; then
-      if test "`uname -m`" = ppc64le; then
-        release=`lsb_release -rs |tr -d .`
-        distro="ubuntu$release-ppc"
-      else
-        release=`lsb_release -rs |tr -d .`
-        distro="ubuntu$release"
-      fi
-    else
-      echo 'Unknown Debian flavor' 1>&2
-      exit 1
-    fi
-  elif lsb_release -is |grep -qi suse; then
-    if test "`uname -m`" = s390x; then
-      release=`lsb_release -rs |sed -e 's/\..*//'`
-      distro="suse$release-s390x"
-    else
-      echo 'Unknown Suse arch' 1>&2
-      exit 1
-    fi
-  elif test -f /etc/redhat-release; then
-    # RHEL or CentOS
-    if test "`uname -m`" = s390x; then
-      distro=rhel72-s390x
-    elif test "`uname -m`" = ppc64le; then
-      distro=rhel71-ppc
-    elif lsb_release >/dev/null 2>&1; then
-      if lsb_release -is |grep -q RedHat; then
-        release=`lsb_release -rs |tr -d .`
-        distro="rhel$release"
-      elif lsb_release -is |grep -q CentOS; then
-        release=`lsb_release -rs |cut -c 1 |sed -e s/7/70/ -e s/6/62/ -e s/8/80/`
-        distro="rhel$release"
-      else
-        echo 'Unknown RHEL flavor' 1>&2
-        exit 1
-      fi
-    else
-      echo lsb_release missing, using /etc/redhat-release 1>&2
-      release=`grep -o 'release [0-9]' /etc/redhat-release |awk '{print $2}'`
-      release=`echo $release |sed -e s/7/70/ -e s/6/62/ -e s/8/80/`
-      distro=rhel$release
-    fi
-  else
-    lsb_release -a
-    echo 'Unknown distro' 1>&2
-    exit 1
-  fi
-  echo "Detected distro: $distro" 1>&2
-  echo $distro
-}

data/spec/shared/shlib/server.sh

@@ -1,416 +0,0 @@
-# This file contains functions pertaining to downloading, starting and
-# configuring a MongoDB server.
-
-# Note that mlaunch is executed with (and therefore installed with) Python 2.
-# The reason for this is that in the past, some of the distros we tested on
-# had an ancient version of Python 3 that was unusable (e.g. it couldn't
-# install anything from PyPI due to outdated TLS/SSL implementation).
-# It is likely that all of the current distros we use have a recent enough
-# and working Python 3 implementation, such that we could use Python 3 for
-# everything.
-#
-# Note that some distros (e.g. ubuntu2004) do not contain a `python' binary
-# at all, thus python2 or python3 must be explicitly specified depending on
-# the desired version.
-
-set_fcv() {
-  if test -n "$FCV"; then
-    mongo --eval 'assert.commandWorked(db.adminCommand( { setFeatureCompatibilityVersion: "'"$FCV"'" } ));' "$MONGODB_URI"
-    mongo --quiet --eval 'db.adminCommand( { getParameter: 1, featureCompatibilityVersion: 1 } )' |grep  "version.*$FCV"
-  fi
-}
-
-add_uri_option() {
-  opt=$1
-
-  if ! echo $MONGODB_URI |sed -e s,//,, |grep -q /; then
-    MONGODB_URI="$MONGODB_URI/"
-  fi
-
-  if ! echo $MONGODB_URI |grep -q '?'; then
-    MONGODB_URI="$MONGODB_URI?"
-  fi
-
-  MONGODB_URI="$MONGODB_URI&$opt"
-}
-
-prepare_server() {
-  arch=$1
-
-  if test -n "$USE_OPT_MONGODB"; then
-    export BINDIR=/opt/mongodb/bin
-    export PATH=$BINDIR:$PATH
-    return
-  fi
-
-  if test "$MONGODB_VERSION" = latest; then
-    # Test on the most recent published 4.3 release.
-    # https://jira.mongodb.org/browse/RUBY-1724
-
-    . $PROJECT_DIRECTORY/.mod/drivers-evergreen-tools/.evergreen/download-mongodb.sh
-
-    get_distro
-    get_mongodb_download_url_for "$DISTRO" "latest"
-    prepare_server_from_url $MONGODB_DOWNLOAD_URL
-  else
-    download_version="$MONGODB_VERSION"
-    url=`$(dirname $0)/get-mongodb-download-url $download_version $arch`
-    prepare_server_from_url $url
-  fi
-
-}
-
-prepare_server_from_url() {
-  url=$1
-
-  dirname=`basename $url |sed -e s/.tgz//`
-  mongodb_dir="$MONGO_ORCHESTRATION_HOME"/mdb/"$dirname"
-  mkdir -p "$mongodb_dir"
-  curl --retry 3 $url | tar xz -C "$mongodb_dir" --strip-components 1 -f -
-  BINDIR="$mongodb_dir"/bin
-  export PATH="$BINDIR":$PATH
-}
-
-install_mlaunch_venv() {
-  python3 -V || true
-  if ! python3 -m venv -h >/dev/null; then
-    # Current virtualenv fails with
-    # https://github.com/pypa/virtualenv/issues/1630
-    python3 -m pip install venv --user
-  fi
-  if ! python3 -m ensurepip -h > /dev/null; then
-    # Debian11/Ubuntu2204 have venv installed, but it is nonfunctional unless
-    # the python3-venv package is also installed (it lacks the ensurepip
-    # module).
-    sudo apt-get install --yes python3-venv
-  fi
-  if test "$USE_SYSTEM_PYTHON_PACKAGES" = 1 &&
-    python3 -m pip list |grep mtools
-  then
-    # Use the existing mtools-legacy
-    :
-  else
-    # Spawn a virtual environment, but only if one is not already
-    # active...
-    if test -z "$VIRTUAL_ENV"; then
-      venvpath="$MONGO_ORCHESTRATION_HOME"/venv
-      python3 -m venv $venvpath
-      . $venvpath/bin/activate
-    fi
-
-    # [mlaunch] does not work:
-    # https://github.com/rueckstiess/mtools/issues/856
-    # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
-    #pip install 'mtools==1.7' 'pymongo==4.1' python-dateutil psutil
-
-    # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
-    pip install 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
-  fi
-}
-
-install_mlaunch_pip() {
-  if test -n "$USE_OPT_MONGODB" && which mlaunch >/dev/null 2>&1; then
-    # mlaunch is preinstalled in the docker image, do not install it here
-    return
-  fi
-
-  python -V || true
-  python3 -V || true
-  pythonpath="$MONGO_ORCHESTRATION_HOME"/python
-  # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
-  pip install -t "$pythonpath" 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
-  export PATH="$pythonpath/bin":$PATH
-  export PYTHONPATH="$pythonpath"
-}
-
-install_mlaunch_git() {
-  repo=$1
-  branch=$2
-  python -V || true
-  python3 -V || true
-  which pip || true
-  which pip3 || true
-
-  if false; then
-    if ! virtualenv --version; then
-      python3 `which pip3` install --user virtualenv
-      export PATH=$HOME/.local/bin:$PATH
-      virtualenv --version
-    fi
-
-    venvpath="$MONGO_ORCHESTRATION_HOME"/venv
-    virtualenv -p python3 $venvpath
-    . $venvpath/bin/activate
-
-    # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
-    pip3 install psutil pymongo python-dateutil
-
-    git clone $repo mlaunch
-    cd mlaunch
-    git checkout origin/$branch
-    python3 setup.py install
-    cd ..
-  else
-    pip install --user 'virtualenv==13'
-    export PATH=$HOME/.local/bin:$PATH
-
-    venvpath="$MONGO_ORCHESTRATION_HOME"/venv
-    virtualenv $venvpath
-    . $venvpath/bin/activate
-
-    # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
-    pip install psutil pymongo python-dateutil
-
-    git clone $repo mlaunch
-    (cd mlaunch &&
-      git checkout origin/$branch &&
-      python2 setup.py install
-    )
-  fi
-}
-
-install_cmake() {
-  if ! command -v cmake &> /dev/null; then
-    if ! command -v apt-get &> /dev/null; then
-      # no apt-get; assume RHEL
-      sudo yum -y install cmake libarchive
-    else
-      sudo apt-get install --yes cmake
-    fi
-  else
-    echo 'cmake is present'
-  fi
-}
-
-# This function sets followong global variables:
-#   server_cert_path
-#   server_ca_path
-#   server_client_cert_path
-#
-# These variables are used later to connect to processes via mongo client.
-calculate_server_args() {
-  local mongo_version=`echo $MONGODB_VERSION |tr -d .`
-
-  if test -z "$mongo_version"; then
-    echo "$MONGODB_VERSION must be set and not contain only dots" 1>&2
-    exit 3
-  fi
-
-  if test $mongo_version = latest; then
-    mongo_version=70
-  fi
-
-  local args="--setParameter enableTestCommands=1"
-
-  if test $mongo_version -ge 50; then
-    args="$args --setParameter acceptApiVersion2=1"
-  elif test $mongo_version -ge 47; then
-    args="$args --setParameter acceptAPIVersion2=1"
-  fi
-
-  # diagnosticDataCollectionEnabled is a mongod-only parameter on server 3.2,
-  # and mlaunch does not support specifying mongod-only parameters:
-  # https://github.com/rueckstiess/mtools/issues/696
-  # Pass it to 3.4 and newer servers where it is accepted by all daemons.
-  if test $mongo_version -ge 34; then
-    args="$args --setParameter diagnosticDataCollectionEnabled=false"
-  fi
-  local uri_options=
-  if test "$TOPOLOGY" = replica-set; then
-    args="$args --replicaset --name test-rs --nodes 2 --arbiter"
-    export HAVE_ARBITER=1
-  elif test "$TOPOLOGY" = sharded-cluster; then
-    args="$args --replicaset --nodes 2 --sharded 1 --name test-rs"
-    if test -z "$SINGLE_MONGOS"; then
-      args="$args --mongos 2"
-    fi
-  elif test "$TOPOLOGY" = standalone; then
-    args="$args --single"
-  elif test "$TOPOLOGY" = load-balanced; then
-    args="$args --replicaset --nodes 2 --sharded 1 --name test-rs --port 27117"
-    if test -z "$MRSS_ROOT"; then
-      echo "Please set MRSS_ROOT" 1>&2
-      exit 2
-    fi
-    if test -n "$SINGLE_MONGOS"; then
-      haproxy_config=$MRSS_ROOT/share/haproxy-1.conf
-    else
-      args="$args --mongos 2"
-      haproxy_config=$MRSS_ROOT/share/haproxy-2.conf
-    fi
-    uri_options="$uri_options&loadBalanced=true"
-  else
-    echo "Unknown topology: $TOPOLOGY" 1>&2
-    exit 1
-  fi
-  if test -n "$MMAPV1"; then
-    args="$args --storageEngine mmapv1 --smallfiles --noprealloc"
-    uri_options="$uri_options&retryReads=false&retryWrites=false"
-  fi
-  if test "$AUTH" = auth; then
-    args="$args --auth --username bob --password pwd123"
-  elif test "$AUTH" = x509; then
-    args="$args --auth --username bootstrap --password bootstrap"
-  elif echo "$AUTH" |grep -q ^aws; then
-    args="$args --auth --username bootstrap --password bootstrap"
-    args="$args --setParameter authenticationMechanisms=MONGODB-AWS,SCRAM-SHA-1,SCRAM-SHA-256"
-    uri_options="$uri_options&authMechanism=MONGODB-AWS&authSource=\$external"
-  fi
-
-  if test -n "$OCSP"; then
-    if test -z "$OCSP_ALGORITHM"; then
-      echo "OCSP_ALGORITHM must be set if OCSP is set" 1>&2
-      exit 1
-    fi
-  fi
-
-  if test "$SSL" = ssl || test -n "$OCSP_ALGORITHM"; then
-    if test -n "$OCSP_ALGORITHM"; then
-      if test "$OCSP_MUST_STAPLE" = 1; then
-        server_cert_path=spec/support/ocsp/$OCSP_ALGORITHM/server-mustStaple.pem
-      else
-        server_cert_path=spec/support/ocsp/$OCSP_ALGORITHM/server.pem
-      fi
-      server_ca_path=spec/support/ocsp/$OCSP_ALGORITHM/ca.crt
-      server_client_cert_path=spec/support/ocsp/$OCSP_ALGORITHM/server.pem
-    else
-      server_cert_path=spec/support/certificates/server-second-level-bundle.pem
-      server_ca_path=spec/support/certificates/ca.crt
-      server_client_cert_path=spec/support/certificates/client.pem
-    fi
-
-    if test -n "$OCSP_ALGORITHM"; then
-      client_cert_path=spec/support/ocsp/$OCSP_ALGORITHM/server.pem
-    elif test "$AUTH" = x509; then
-      client_cert_path=spec/support/certificates/client-x509.pem
-
-      uri_options="$uri_options&authMechanism=MONGODB-X509"
-    elif echo $RVM_RUBY |grep -q jruby; then
-      # JRuby does not grok chained certificate bundles -
-      # https://github.com/jruby/jruby-openssl/issues/181
-      client_cert_path=spec/support/certificates/client.pem
-    else
-      client_cert_path=spec/support/certificates/client-second-level-bundle.pem
-    fi
-
-    uri_options="$uri_options&tls=true&"\
-"tlsCAFile=$server_ca_path&"\
-"tlsCertificateKeyFile=$client_cert_path"
-
-    args="$args --sslMode requireSSL"\
-" --sslPEMKeyFile $server_cert_path"\
-" --sslCAFile $server_ca_path"\
-" --sslClientCertificate $server_client_cert_path"
-  fi
-
-  # Docker forwards ports to the external interface, not to the loopback.
-  # Hence we must bind to all interfaces here.
-  if test -n "$BIND_ALL"; then
-    args="$args --bind_ip_all"
-  fi
-
-  # MongoDB servers pre-4.2 do not enable zlib compression by default
-  if test "$COMPRESSOR" = snappy; then
-    args="$args --networkMessageCompressors snappy"
-  elif test "$COMPRESSOR" = zlib; then
-    args="$args --networkMessageCompressors zlib"
-  fi
-
-  if test -n "$OCSP_ALGORITHM" || test -n "$OCSP_VERIFIER"; then
-    python3 -m pip install asn1crypto oscrypto flask
-  fi
-
-  local ocsp_args=
-  if test -n "$OCSP_ALGORITHM"; then
-    if test -z "$server_ca_path"; then
-      echo "server_ca_path must have been set" 1>&2
-      exit 1
-    fi
-    ocsp_args="--ca_file $server_ca_path"
-    if test "$OCSP_DELEGATE" = 1; then
-      ocsp_args="$ocsp_args \
-  --ocsp_responder_cert spec/support/ocsp/$OCSP_ALGORITHM/ocsp-responder.crt \
-  --ocsp_responder_key spec/support/ocsp/$OCSP_ALGORITHM/ocsp-responder.key \
-  "
-    else
-      ocsp_args="$ocsp_args \
-  --ocsp_responder_cert spec/support/ocsp/$OCSP_ALGORITHM/ca.crt \
-  --ocsp_responder_key spec/support/ocsp/$OCSP_ALGORITHM/ca.key \
-  "
-    fi
-    if test -n "$OCSP_STATUS"; then
-      ocsp_args="$ocsp_args --fault $OCSP_STATUS"
-    fi
-  fi
-
-  OCSP_ARGS="$ocsp_args"
-  SERVER_ARGS="$args"
-  URI_OPTIONS="$uri_options"
-}
-
-launch_ocsp_mock() {
-  if test -n "$OCSP_ARGS"; then
-    # Bind to 0.0.0.0 for Docker
-    python3 spec/support/ocsp/ocsp_mock.py $OCSP_ARGS -b 0.0.0.0 -p 8100 &
-    OCSP_MOCK_PID=$!
-  fi
-}
-
-launch_server() {
-  local dbdir="$1"
-  python3 -m mtools.mlaunch.mlaunch --dir "$dbdir" --binarypath "$BINDIR" $SERVER_ARGS
-
-  if test "$TOPOLOGY" = sharded-cluster && test $MONGODB_VERSION = 3.6; then
-    # On 3.6 server the sessions collection is not immediately available,
-    # so we run the refreshLogicalSessionCacheNow command on the config server
-    # and again on each mongos in order for the mongoses
-    # to correctly report logicalSessionTimeoutMinutes.
-    mongos_regex="\s*mongos\s+([0-9]+)\s+running\s+[0-9]+"
-    config_server_regex="\s*config\sserver\s+([0-9]+)\s+running\s+[0-9]+"
-    config_server=""
-    mongoses=()
-    if test "$AUTH" = auth
-    then
-      base_url="mongodb://bob:pwd123@localhost"
-    else
-      base_url="mongodb://localhost"
-    fi
-    if test "$SSL" = "ssl"
-    then
-      mongo_command="${BINDIR}/mongo --ssl --sslPEMKeyFile $server_cert_path --sslCAFile $server_ca_path"
-    else
-      mongo_command="${BINDIR}/mongo"
-    fi
-
-    while read -r line
-    do
-        if [[ $line =~ $config_server_regex ]]
-        then
-            port="${BASH_REMATCH[1]}"
-            config_server="${base_url}:${port}"
-        fi
-        if [[ $line =~ $mongos_regex ]]
-        then
-            port="${BASH_REMATCH[1]}"
-            mongoses+=("${base_url}:${port}")
-        fi
-    done < <(python2 -m mtools.mlaunch.mlaunch list --dir "$dbdir" --binarypath "$BINDIR")
-
-    if [ -n "$config_server" ]; then
-      ${mongo_command} "$config_server" --eval 'db.adminCommand("refreshLogicalSessionCacheNow")'
-      for mongos in ${mongoses[*]}
-      do
-        ${mongo_command} "$mongos" --eval 'db.adminCommand("refreshLogicalSessionCacheNow")'
-      done
-    fi
-  fi
-
-  if test "$TOPOLOGY" = load-balanced; then
-    if test -z "$haproxy_config"; then
-      echo haproxy_config should have been set 1>&2
-      exit 3
-    fi
-
-    haproxy -D -f $haproxy_config -p $mongodb_dir/haproxy.pid
-  fi
-}

data/spec/shared/shlib/set_env.sh

@@ -1,169 +0,0 @@
-# When changing, also update the hash in share/Dockerfile.
-TOOLCHAIN_VERSION=e8c60866f54bed7e336a37df3a97d6ae1b971b7d
-
-set_env_java() {
-  ls -l /opt || true
-  ls -l /usr/lib/jvm || true
-
-  # Use toolchain java if it exists
-  if [ -f /opt/java/jdk8/bin/java ]; then
-    export JAVACMD=/opt/java/jdk8/bin/java
-    #export PATH=$PATH:/opt/java/jdk8/bin
-  fi
-
-  # ppc64le has it in a different place
-  if test -z "$JAVACMD" && [ -f /usr/lib/jvm/java-1.8.0/bin/java ]; then
-    export JAVACMD=/usr/lib/jvm/java-1.8.0/bin/java
-    #export PATH=$PATH:/usr/lib/jvm/java-1.8.0/bin
-  fi
-
-  if true; then
-    # newer
-    # rhel71-ppc, https://jira.mongodb.org/browse/BUILD-9231
-    if test -z "$JAVACMD" &&
-      (ls /opt/java || true) |grep -q java-1.8.0-openjdk-1.8.0 &&
-      test -f /opt/java/java-1.8.0-openjdk-1.8.0*/bin/java;
-    then
-      path=$(cd /opt/java && ls -d java-1.8.0-openjdk-1.8.0* |head -n 1)
-      export JAVACMD=/opt/java/"$path"/bin/java
-    fi
-  else
-    # older
-    # rhel71-ppc seems to have an /opt/java/jdk8/bin/java but it doesn't work
-    if test -n "$JAVACMD" && ! exec $JAVACMD -version; then
-      JAVACMD=
-      # we will try the /usr/lib/jvm then
-    fi
-  fi
-
-  if test -n "$JAVACMD"; then
-    eval $JAVACMD -version
-  elif which java 2>/dev/null; then
-    java -version
-  else
-    echo No java runtime found
-  fi
-}
-
-set_env_python() {
-  if test "$DOCKER_PRELOAD" != 1; then
-    if test -n "$DOCKER"; then
-      # If we are running in Docker and not preloading, we need to fetch the
-      # Python binary.
-      curl -fL --retry 3 https://github.com/p-mongodb/deps/raw/main/"$arch"-python37.tar.xz | \
-        tar xfJ - -C /opt
-    fi
-
-    if test -d /opt/python/3.7/bin; then
-      # Most Evergreen configurations.
-      export PATH=/opt/python/3.7/bin:$PATH
-    elif test -d /opt/python37/bin; then
-      # Configurations that use Docker in Evergreen - these don't preload.
-      export PATH=/opt/python37/bin:$PATH
-    fi
-
-    python3 -V
-  fi
-}
-
-set_env_node() {
-  if test "$DOCKER_PRELOAD" != 1; then
-    dir=`ls -d /opt/nodejs/node-v12* |head -1`
-    if test -z "$dir"; then
-      echo "Node 12 missing" 1>&2
-      exit 2
-    fi
-    export PATH="$dir/bin:$PATH"
-  elif test -d /opt/node/bin; then
-    # Node from toolchain in Evergreen
-    export PATH=/opt/node/bin:$PATH
-  fi
-
-  node -v
-}
-
-set_env_ruby() {
-  if test -z "$RVM_RUBY"; then
-    echo "Empty RVM_RUBY, aborting"
-    exit 2
-  fi
-
-  #ls -l /opt
-
-  # Necessary for jruby
-  set_env_java
-
-  if [ "$RVM_RUBY" == "ruby-head" ]; then
-    # When we use ruby-head, we do not install the Ruby toolchain.
-    # But we still need Python 3.6+ to run mlaunch.
-    # Since the ruby-head tests are run on ubuntu1604, we can use the
-    # globally installed Python toolchain.
-    #export PATH=/opt/python/3.7/bin:$PATH
-
-    # 12.04, 14.04 and 16.04 are good
-    curl --retry 3 -fL http://rubies.travis-ci.org/ubuntu/`lsb_release -rs`/x86_64/ruby-head.tar.bz2 |tar xfj -
-    # TODO adjust gem path?
-    export PATH=`pwd`/ruby-head/bin:`pwd`/ruby-head/lib/ruby/gems/2.6.0/bin:$PATH
-    ruby --version
-    ruby --version |grep dev
-  elif test "$SYSTEM_RUBY" = 1; then
-    # Nothing
-    :
-  else
-    if test "$USE_OPT_TOOLCHAIN" = 1; then
-      # Nothing, also PATH is already set
-      :
-    elif true; then
-
-    # For testing toolchains:
-    #toolchain_url=https://s3.amazonaws.com//mciuploads/mongo-ruby-toolchain/`host_distro`/f11598d091441ffc8d746aacfdc6c26741a3e629/mongo_ruby_driver_toolchain_`host_distro |tr - _`_patch_f11598d091441ffc8d746aacfdc6c26741a3e629_5e46f2793e8e866f36eda2c5_20_02_14_19_18_18.tar.gz
-    toolchain_url=http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-driver/$TOOLCHAIN_VERSION/`host_distro`/$RVM_RUBY.tar.xz
-    curl --retry 3 -fL $toolchain_url |tar Jxf -
-    export PATH=`pwd`/rubies/$RVM_RUBY/bin:$PATH
-    #export PATH=`pwd`/rubies/python/3/bin:$PATH
-
-    # Attempt to get bundler to report all errors - so far unsuccessful
-    #curl --retry 3 -o bundler-openssl.diff https://github.com/bundler/bundler/compare/v2.0.1...p-mongo:report-errors.diff
-    #find . -path \*/lib/bundler/fetcher.rb -exec patch {} bundler-openssl.diff \;
-
-    else
-
-    # Normal operation
-    if ! test -d $HOME/.rubies/$RVM_RUBY/bin; then
-      echo "Ruby directory does not exist: $HOME/.rubies/$RVM_RUBY/bin" 1>&2
-      echo "Contents of /opt:" 1>&2
-      ls -l /opt 1>&2 || true
-      echo ".rubies symlink:" 1>&2
-      ls -ld $HOME/.rubies 1>&2 || true
-      echo "Our rubies:" 1>&2
-      ls -l $HOME/.rubies 1>&2 || true
-      exit 2
-    fi
-    export PATH=$HOME/.rubies/$RVM_RUBY/bin:$PATH
-
-    fi
-
-    ruby --version
-
-    # Ensure we're using the right ruby
-    ruby_name=`echo $RVM_RUBY |awk -F- '{print $1}'`
-    ruby_version=`echo $RVM_RUBY |awk -F- '{print $2}' |cut -c 1-3`
-
-    ruby -v |fgrep $ruby_name
-    ruby -v |fgrep $ruby_version
-
-    # We shouldn't need to update rubygems, and there is value in
-    # testing on whatever rubygems came with each supported ruby version
-    #echo 'updating rubygems'
-    #gem update --system
-
-    # Only install bundler when not using ruby-head.
-    # ruby-head comes with bundler and gem complains
-    # because installing bundler would overwrite the bundler binary.
-    # We now install bundler in the toolchain, hence nothing needs to be done
-    # in the tests.
-    if false && echo "$RVM_RUBY" |grep -q jruby; then
-      gem install bundler -v '<2'
-    fi
-  fi
-}