mongoid 7.5.4 → 7.6.1

data/spec/shared/lib/mrss/spec_organizer.rb

@@ -25,19 +25,19 @@ module Mrss
     end
 
     def initialize(root: nil, classifiers:, priority_order:,
-      spec_root: nil, rspec_json_path: nil, rspec_all_json_path: nil,
-      randomize: false
+      spec_root: nil, rspec_json_path: nil, rspec_all_json_path: nil, rspec_xml_path: nil, randomize: false
     )
       @spec_root = spec_root || File.join(root, 'spec')
       @classifiers = classifiers
       @priority_order = priority_order
       @rspec_json_path = rspec_json_path || File.join(root, 'tmp/rspec.json')
       @rspec_all_json_path = rspec_all_json_path || File.join(root, 'tmp/rspec-all.json')
+      @rspec_xml_path = rspec_xml_path || File.join(root, 'tmp/rspec.xml')
       @randomize = !!randomize
     end
 
     attr_reader :spec_root, :classifiers, :priority_order
-    attr_reader :rspec_json_path, :rspec_all_json_path
+    attr_reader :rspec_json_path, :rspec_all_json_path, :rspec_xml_path
 
     def randomize?
       @randomize
@@ -47,6 +47,25 @@ module Mrss
       @seed ||= (rand * 100_000).to_i
     end
 
+    # Remove all XML files from tmp directory before running tests
+    def cleanup_xml_files
+      xml_pattern = File.join(File.dirname(rspec_xml_path), '*.xml')
+      Dir.glob(xml_pattern).each do |xml_file|
+        FileUtils.rm_f(xml_file)
+      end
+    end
+
+    # Move the XML file to a timestamped version for evergreen upload
+    def archive_xml_file(category)
+      return unless File.exist?(rspec_xml_path)
+
+      timestamp = Time.now.strftime('%Y%m%d_%H%M%S_%3N')
+      archived_path = rspec_xml_path.sub(/\.xml$/, "-#{category}-#{timestamp}.xml")
+
+      FileUtils.mv(rspec_xml_path, archived_path)
+      puts "Archived XML results to #{archived_path}"
+    end
+
     def buckets
       @buckets ||= {}.tap do |buckets|
         Find.find(spec_root) do |path|
@@ -96,6 +115,8 @@ module Mrss
 
     def run_buckets(*buckets)
       FileUtils.rm_f(rspec_all_json_path)
+      # Clean up all XML files before starting test runs
+      cleanup_xml_files
 
       buckets.each do |bucket|
         if bucket && !self.buckets[bucket]
@@ -131,7 +152,12 @@ module Mrss
     def run_files(category, paths)
       puts "Running #{category.to_s.gsub('_', ' ')} tests"
       FileUtils.rm_f(rspec_json_path)
+      FileUtils.rm_f(rspec_xml_path)  # Clean up XML file before running this bucket
+
       cmd = %w(rspec) + paths
+      # Add junit formatter for XML output
+      cmd += ['--format', 'Rfc::Riff', '--format', 'RspecJunitFormatter', '--out', rspec_xml_path]
+
       if randomize?
         cmd += %W(--order rand:#{seed})
       end
@@ -147,6 +173,9 @@ module Mrss
             FileUtils.cp(rspec_json_path, rspec_all_json_path)
           end
         end
+
+        # Archive XML file after running this bucket
+        archive_xml_file(category)
       end
 
       true

data/spec/shared/lib/mrss/utils.rb

@@ -3,13 +3,35 @@
 
 module Mrss
   module Utils
+    extend self
 
-    module_function def print_backtrace(dest=STDERR)
-      begin
-        hello world
-      rescue => e
-        dest.puts e.backtrace.join("\n")
-      end
+    def print_backtrace(dest=STDERR)
+      raise
+    rescue => e
+      dest.puts e.backtrace.join("\n")
+    end
+
+    # Parses the given version string, accounting for suffix information that
+    # Gem::Version cannot successfully parse.
+    #
+    # @param [ String ] version the version to parse
+    #
+    # @return [ Gem::Version ] the parsed version
+    #
+    # @raise [ ArgumentError ] if the string cannot be parsed.
+    def parse_version(version)
+      Gem::Version.new(version)
+    rescue ArgumentError
+      match = version.match(/\A(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)?(-[A-Za-z\+\d]+)?\z/)
+      raise ArgumentError.new("Malformed version number string #{version}") if match.nil?
+
+      Gem::Version.new(
+        [
+          match[:major],
+          match[:minor],
+          match[:patch]
+        ].join('.')
+      )
     end
   end
 end

data/spec/shared/lib/tasks/candidate.rake

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require_relative '../mrss/release/candidate'
+
+namespace :candidate do
+  desc 'Initialize a new product.yml file'
+  task :init do
+    Mrss::Release::ProductData.init!
+    puts "product.yml file created"
+  end
+
+  desc 'Print the release notes for the next candidate release'
+  task :preview do
+    Mrss::Release::Candidate.instance do |candidate|
+      # load the pending changes before bumping the version, since it
+      # depends on the value of the current version.
+      candidate.pending_changes
+      candidate.bump_version
+      puts candidate.release_notes
+    end
+  end
+
+  desc 'List the pull requests to be included in the next release'
+  task :prs do
+    Mrss::Release::Candidate.instance.decorated_prs.each do |pr|
+      print "\##{pr['number']}[#{pr['type-code']}] "
+      print "#{pr['jira']} " if pr['jira']
+      puts pr['short-title']
+    end
+  end
+
+  desc 'Create a new branch and pull request for the candidate'
+  task create: :check_branch_status do
+    Mrss::Release::Candidate.instance do |candidate|
+      origin = `git config get remote.origin.url`
+      match = origin.match(/:(.*?)\//) or raise "origin url is not in expected format: #{origin.inspect}"
+      user = match[1]
+
+      puts 'gathering candidate info and bumping version...'
+      candidate.bump_version!
+
+      puts 'writing release notes to /tmp/pr-body.md...'
+      File.write('/tmp/pr-body.md', candidate.release_notes)
+
+      sh 'git', 'checkout', '-b', candidate.branch_name
+      sh 'git', 'commit', '-am', "Bump version to #{candidate.product.version}"
+      sh 'git', 'push', 'origin', candidate.branch_name
+
+      sh 'gh', 'pr', 'create',
+           '--head', "#{user}:#{candidate.branch_name}",
+           '--base', candidate.product.base_branch,
+           '--title', "Release candidate for #{candidate.product.version}",
+           '--label', 'release-candidate',
+           '--body-file', '/tmp/pr-body.md'
+    end
+  end
+
+  # Ensures the current branch is up-to-date with no uncommitted changes
+  task :check_branch_status do
+    sh 'git pull >/dev/null', verbose: false
+    changes = `git status --short --untracked-files=no`.strip
+    abort "There are uncommitted changes. Commit (or revert) the changes and try again." if changes.length > 0
+  end
+end

data/spec/shared/share/Dockerfile.erb

@@ -1,26 +1,9 @@
-# Python toolchain as of this writing is available on rhel62, debian92 and
-# ubuntu1604.
-#
-# To run rhel62 in docker, host system must be configured to emulate syscalls:
-# https://github.com/CentOS/sig-cloud-instance-images/issues/103
-
 <%
 
-python_toolchain_url = "https://s3.amazonaws.com//mciuploads/mongo-python-driver-toolchain/#{distro}/ba92de2700c04ee2d4f82c3ffdfc33105140cb04/mongo_python_driver_toolchain_#{distro.gsub('-', '_')}_ba92de2700c04ee2d4f82c3ffdfc33105140cb04_19_11_14_15_33_33.tar.gz"
-server_version = '4.3.3'
-server_url = "http://downloads.10gen.com/linux/mongodb-linux-x86_64-enterprise-#{distro}-#{server_version}.tgz"
-server_archive_basename = File.basename(server_url)
-server_extracted_dir = server_archive_basename.sub(/\.(tar\.gz|tgz)$/, '')
-
-# When changing, also update the hash in shlib/set_env.sh.
-TOOLCHAIN_VERSION='219833abad4d9d3bf43c0fef101a8ca082ac4ae9'
-
 def ruby_toolchain_url(ruby)
-  "http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-driver/#{TOOLCHAIN_VERSION}/#{distro}/#{ruby}.tar.xz"
+  "http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-toolchain/library/#{distro}/#{ruby}.tar.xz"
 end
 
-#ruby_toolchain_url = "https://s3.amazonaws.com//mciuploads/mongo-ruby-toolchain/#{distro}/#{TOOLCHAIN_VERSION}/mongo_ruby_driver_toolchain_#{distro.gsub('-', '_')}_patch_#{TOOLCHAIN_VERSION}_#{toolchain_lower}.tar.gz"
-
 %>
 
 FROM <%= base_image %>
@@ -37,18 +20,6 @@ ENV DOCKER=1
 
 <% end %>
 
-<% if ruby_head? %>
-
-  # To use current versions of mlaunch, Python 3.7+ is required.
-  # Many distros ship with older Pythons, therefore we need to install
-  # a newer Python from somewhere. This section installs the Python
-  # toolchain which comes with recent Pythons.
-
-  #RUN curl --retry 3 -fL <%= python_toolchain_url %> -o python-toolchain.tar.gz
-  #RUN tar -xC /opt -zf python-toolchain.tar.gz
-
-<% end %>
-
 <% if debian? %>
 
   # zsh is not required for any scripts but it is a better interactive shell
@@ -56,7 +27,7 @@ ENV DOCKER=1
   # Ruby runtime dependencies: libyaml-0-2
   # Compiling ruby libraries: gcc make
   # Compiling python packages: python3-dev
-  # JRuby: openjdk-8-jdk-headless
+  # JRuby: openjdk-17-jdk-headless
   # Server dependencies: libsnmp30 libcurl3/libcurl4
   # Determining OS we are running on: lsb-release
   # Load balancer testing: haproxy
@@ -77,75 +48,45 @@ ENV DOCKER=1
   # therefore install python-pip in all configurations here.
 
   <% packages = %w(
-    procps lsb-release bzip2 curl zsh
-    git make gcc libyaml-0-2 libgmp-dev zlib1g-dev libsnappy-dev
+    procps lsb-release bzip2 curl wget gpg zsh
+    git make gcc g++ libyaml-dev libgmp-dev zlib1g-dev libsnappy-dev
     krb5-user krb5-kdc krb5-admin-server libsasl2-dev libsasl2-modules-gssapi-mit
-    haproxy
-    python3-pip
-    tzdata shared-mime-info
+    haproxy libcurl4
+    tzdata shared-mime-info software-properties-common xz-utils nodejs npm
+    openjdk-17-jdk-headless
   ) %>
 
   <% if distro =~ /ubuntu2004/ %>
     <% packages << 'libsnmp35' %>
+  <% elsif distro =~ /ubuntu2204|debian11/ %>
+    <% packages << 'libsnmp40' %>
   <% else %>
     <% packages << 'libsnmp30' %>
   <% end %>
 
-  <% if distro !~ /ubuntu2004/ %>
+  <% if distro !~ /ubuntu2004|ubuntu2204|debian11/ %>
     <% packages << 'python-pip' %>
   <% end %>
 
-  <% if distro =~ /debian10/ %>
-    <% packages << 'openjdk-11-jdk-headless' %>
-  <% elsif distro =~ /ubuntu1404/ %>
-    # Ubuntu 14.04 only has openjdk 7, this is too old to be useful
-  <% else %>
-    <% packages << 'openjdk-8-jdk-headless' %>
+  <% if distro =~ /ubuntu2204|debian11/ %>
+    <% packages << 'python3-venv' %>
   <% end %>
 
-  # ubuntu1404, ubuntu1604: libcurl3
-  # ubuntu1804, ubuntu2004, debian10: libcurl4
-  <% if distro =~ /ubuntu1804|ubuntu2004|debian10/ %>
-    <% packages << 'libcurl4' %>
-  <% else %>
-    <% packages << 'libcurl3' %>
+  <% if distro =~ /ubuntu2004|ubuntu2204/ %>
+    <% packages += %w(ruby bundler) %>
   <% end %>
 
-  <% if distro =~ /ubuntu1804|ubuntu2004/ %>
-    <% packages << 'nodejs' %>
-  <% end %>
+  RUN apt-get update && apt-get install -y <%= packages.join(' ') %>
 
-  <% if distro =~ /ubuntu2004/ %>
-    <% packages += %w(ruby ruby2.7 bundler) %>
+  <% if ubuntu? %>
+    RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
+    RUN echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null
   <% end %>
-
-  RUN apt-get update && apt-get install -y <%= packages.join(' ') %>
-  
+  RUN apt-add-repository ppa:deadsnakes/ppa -y
+  RUN apt-get update && apt-get install -y cmake python3.10 python3.10-dev python3.10-venv
+  RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 1
 <% else %>
 
-  <% if distro =~ /rhel6/ %>
-  
-    # CentOS 6 is dead - to use it retrieve the packages from vault:
-    # https://stackoverflow.com/questions/53562691/error-cannot-retrieve-repository-metadata-repomd-xml-for-repository-base-pl
-  
-    <%
-      
-      cfg = <<-CFG
-[base]
-name=CentOS-$releasever - Base
-#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
-#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
-baseurl=http://vault.centos.org/6.10/os/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-CFG
-
-    %>
-  
-    RUN printf "<%= cfg.gsub("\n", "\\n") %>" >/etc/yum.repos.d/CentOS-Base.repo
-  
-  <% end %>
-  
   # Enterprise server: net-snmp
   # lsb_release: redhat-lsb-core
   # our runner scripts: which
@@ -154,31 +95,16 @@ CFG
   # Kerberos tests: krb5-workstation + cyrus-sasl-devel to build the
   # mongo_kerberos gem + cyrus-sasl-gssapi for authentication to work
   # Local Kerberos server: krb5-server
-  # JRuby: java-1.8.0-openjdk
+  # JRuby: java-17-openjdk
   #
   # Note: lacking cyrus-sasl-gssapi produces a cryptic message
   # "SASL(-4): no mechanism available: No worthy mechs found"
   # https://github.com/farorm/python-ad/issues/10
 
-  RUN yum install -y redhat-lsb-core which git gcc libyaml krb5-server \
-    krb5-workstation cyrus-sasl-devel cyrus-sasl-gssapi java-1.8.0-openjdk \
-    net-snmp python3
-
-  <% if distro =~ /rhel6/ %>
-
-    # RHEL 6 ships with Python 2.6.
-
-    RUN yum install -y centos-release-scl && \
-      yum install -y python27-python python27-python-devel
-    ENV PATH=/opt/rh/python27/root/usr/bin:$PATH \
-      LD_LIBRARY_PATH=/opt/rh/python27/root/usr/lib64
-
-  <% else %>
-
-    RUN yum install -y python-devel
+  RUN yum --enablerepo=powertools install -y redhat-lsb-core which git gcc gcc-c++ libyaml-devel krb5-server \
+    krb5-workstation cyrus-sasl-devel cyrus-sasl-gssapi java-17-openjdk \
+    net-snmp python38 python38-devel cmake nodejs npm xz
 
-  <% end %>
-  
 <% end %>
 
 <% if preload? %>
@@ -220,7 +146,7 @@ CFG
   <% when 'git' %>
     # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
     RUN python3 -m pip install virtualenv 'pymongo>=4' python-dateutil psutil
-    
+
     # Install mtools from git because released versions do not work with pymongo 4.0
     RUN git clone https://github.com/p-mongodb/mtools && \
       cd mtools && \
@@ -234,7 +160,7 @@ CFG
   <% if @env.fetch('MONGODB_VERSION') >= '4.4' %>
     # ubuntu1604 installs MarkupSafe 0.0.0 here instead of 2.0.0+
     # as specified by dependencies, causing OCSP mock to not work.
-    RUN python3 -mpip install asn1crypto oscrypto flask --upgrade
+    RUN python3 -mpip install asn1crypto oscrypto flask --upgrade --ignore-installed
   <% end %>
 
   # FLE is tested against 4.0+ servers.
@@ -243,7 +169,7 @@ CFG
     # boto3~=1.19 cryptography~=3.4.8 pykmip~=0.10.0
     # cryptography does not install due to lacking setuptools_rust
     # (either that version or anything that isn't part of system packages)
-    RUN python3 -mpip install boto3~=1.19 cryptography pykmip~=0.10.0
+    RUN python3 -mpip install boto3~=1.19 cryptography pykmip~=0.10.0 'sqlalchemy<2.0.0'
   <% end %>
 
   <% unless ruby_head? || system_ruby? %>
@@ -251,14 +177,9 @@ CFG
     RUN curl --retry 3 -fL <%= ruby_toolchain_url(ruby) %> |tar -xC /opt -Jf -
     ENV PATH=/opt/rubies/<%= ruby %>/bin:$PATH \
       USE_OPT_TOOLCHAIN=1
-    #ENV PATH=/opt/rubies/python/3/bin:$PATH
 
   <% end %>
 
-  RUN curl --retry 3 -fL <%= server_download_url %> |tar xzf - && \
-    mv mongo*/ /opt/mongodb
-  ENV USE_OPT_MONGODB=1 USE_SYSTEM_PYTHON_PACKAGES=1
-
 <% end %>
 
 <% if distro =~ /debian|ubuntu/ %>
@@ -298,6 +219,8 @@ WORKDIR /app
   ENV DOCKER_PRELOAD=1
 <% end %>
 
+RUN npm install --global yarn
+
 ENV MONGO_ORCHESTRATION_HOME=/tmpfs \
   PROJECT_DIRECTORY=/app \
   <%= @env.map { |k, v| %Q`#{k}="#{v.gsub('$', "\\$").gsub('"', "\\\"")}"` }.join(" \\\n  ") %>
@@ -308,6 +231,9 @@ ENV MONGO_ORCHESTRATION_HOME=/tmpfs \
 
 COPY . .
 
+RUN bash -c '. .evergreen/download-mongodb.sh && get_distro && get_mongodb_download_url_for "$DISTRO" "<%= server_version %>" && curl --retry 3 -fL $MONGODB_DOWNLOAD_URL |tar xzf - && mv mongo*/ /opt/mongodb'
+ENV USE_OPT_MONGODB=1 USE_SYSTEM_PYTHON_PACKAGES=1
+
 <% if expose? %>
 
   <% ports = [] %>

data/spec/shared/shlib/distro.sh

@@ -64,6 +64,16 @@ _detect_distro() {
       release=`echo $release |sed -e s/7/70/ -e s/6/62/ -e s/8/80/`
       distro=rhel$release
     fi
+  elif test -f /etc/os-release; then
+    name=`grep -o '^NAME=.*' /etc/os-release | awk -F '"' '{ print $2 }'`
+    version=`grep -o '^VERSION=.*' /etc/os-release | awk -F '"' '{ print $2 }'`
+    if test "$name" = "Amazon Linux"; then
+      distro=amazon$version
+    else
+      cat /etc/os-release
+      echo 'Unknown distro' 1>&2
+      exit 1
+    fi
   else
     lsb_release -a
     echo 'Unknown distro' 1>&2

data/spec/shared/shlib/server.sh

@@ -35,38 +35,34 @@ add_uri_option() {
 }
 
 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
+  . $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
+  get_distro
+  arch="${1:-$DISTRO}"
 
+  get_mongodb_download_url_for "$arch" "$MONGODB_VERSION"
+  prepare_server_from_url "$MONGODB_DOWNLOAD_URL" "$MONGOSH_DOWNLOAD_URL"
 }
 
 prepare_server_from_url() {
-  url=$1
+  server_url=$1
+  mongosh_url=$2
 
-  dirname=`basename $url |sed -e s/.tgz//`
+  dirname=`basename $server_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 -
+  curl --retry 3 $server_url | tar xz -C "$mongodb_dir" --strip-components 1 -f -
+
+  if test -n "$mongosh_url"; then
+    curl --retry 3 $mongosh_url | tar xz -C "$mongodb_dir" --strip-components 1 -f -
+  fi
+
   BINDIR="$mongodb_dir"/bin
   export PATH="$BINDIR":$PATH
 }
@@ -78,21 +74,33 @@ install_mlaunch_venv() {
     # 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 update && 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
-    venvpath="$MONGO_ORCHESTRATION_HOME"/venv
-    python3 -m venv $venvpath
-    . $venvpath/bin/activate
+    # 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 --upgrade setuptools
     pip install 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
   fi
 }
@@ -158,6 +166,32 @@ install_mlaunch_git() {
   fi
 }
 
+install_haproxy() {
+  if ! command -v haproxy &> /dev/null; then
+    if ! command -v apt-get &> /dev/null; then
+      # no apt-get; assume RHEL
+      sudo yum -y install haproxy
+    else
+      sudo apt-get update && sudo apt-get install --yes haproxy
+    fi
+  else
+    echo 'haproxy is present'
+  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 update && 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
@@ -173,7 +207,7 @@ calculate_server_args() {
   fi
 
   if test $mongo_version = latest; then
-    mongo_version=60
+    mongo_version=70
   fi
 
   local args="--setParameter enableTestCommands=1"
@@ -184,17 +218,14 @@ calculate_server_args() {
     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
+  args="$args --setParameter diagnosticDataCollectionEnabled=false"
+
   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" = replica-set-single-node; then
+    args="$args --replicaset --name test-rs --nodes 1"
   elif test "$TOPOLOGY" = sharded-cluster; then
     args="$args --replicaset --nodes 2 --sharded 1 --name test-rs"
     if test -z "$SINGLE_MONGOS"; then