Import tools: e914484acd3a6e6f0c384de565a5d353d67aed52 from branch v4.1

ref: 5f03660335..e914484acd
for: 4.1.3

TOOLS-1982    Automate testing TLS 1.1 or 1.2 connections on all platforms
TOOLS-1989    Switch evergreen intensive testing to match server priority buildversions
TOOLS-2011    Restore sharded cluster testing
TOOLS-2035    mongofiles_write_concern_mongos.js fails on server unstable
TOOLS-2048    Disable failing mongofiles_write_concern_mongos.js test
TOOLS-2050    oplog_rename_test fails on Windows due to access violation error
TOOLS-2099    Tools jstests failing on replica set shutdown
TOOLS-2100    Orchestration tests fail to start on mongodb latest
TOOLS-2107    Can't do live testing of mongoreplay on Evergreen mac
TOOLS-2108    mongoreplay live test times out
TOOLS-2116    mongoreplay live test requires newer python toolchain
TOOLS-2117    Mixed-version tests run during single-version test tasks
TOOLS-2119    Evergreen Kerberos tests failing on RHEL6
TOOLS-2120    QA tests download incorrect latest mongodb versions on macos and windows

5 files changed, 577 insertions, 118 deletions

diff --git a/src/mongo/gotools/binaryurl.py b/src/mongo/gotools/binaryurl.py
index 4b25ec2fb0b..ce68cf1e431 100644
--- a/src/mongo/gotools/binaryurl.py
+++ b/src/mongo/gotools/binaryurl.py
@@ -33,6 +33,20 @@ if not opts.version:
 if opts.version == "2.4" and opts.edition == "enterprise":
   opts.edition = "subscription"
 
+def isVersionGreaterOrEqual(left, right):
+  l = left.split(".")
+  r = right.split(".")
+  for i in range(len(l)):
+    if l[i] < r[i]:
+      return False
+  return True
+
+if opts.version == "latest" or isVersionGreaterOrEqual(opts.version,"4.1.0"):
+  if opts.target in ('osx-ssl', 'osx'):
+    opts.target = 'macos'
+  if opts.target in ('windows_x86_64-2008plus-ssl', 'windows_x86_64-2008plus'):
+    opts.target = 'windows_x86_64-2012plus'
+
 def isCorrectVersion(version):
   actual = version["version"].split(".")
   desired = opts.version.split(".")
diff --git a/src/mongo/gotools/common-pvt.yml b/src/mongo/gotools/common-pvt.yml
new file mode 100644
index 00000000000..2a2a2a00858
--- /dev/null
+++ b/src/mongo/gotools/common-pvt.yml
@@ -0,0 +1,379 @@
+#######################################
+#    Tools Driver Config for MCI      #
+#######################################
+# default command type
+command_type: system
+
+# run the same task in the previous revision if the current task fails
+stepback: true
+
+mongo_tools_variables:
+
+  mongo_tools_task_lists:
+
+    atlas_live_test_task_list: &atlas_live_tasks
+      - dist
+      - test_atlas_free
+      - test_atlas_replica
+      - test_atlas_sharded
+      - test_atlas_tls11
+      - test_atlas_tls12
+
+functions:
+
+  "build tool":
+    command: shell.exec
+    type: test
+    params:
+      working_dir: src
+      script: |
+        set -x
+        set -v
+        set -e
+        echo "Building ${tool}..."
+        if [ "Windows_NT" = "$OS" ]; then
+            set -o igncr
+        fi;
+        # In RHEL 5.5, /usr/bin/ld can't handle --build-id parameters, so
+        # use a wrapper if it's present on the system
+        #
+        if [ -d /opt/ldwrapper/bin ]
+        then
+          export PATH=/opt/ldwrapper/bin:$PATH
+        fi
+
+        sed -i.bak "s/built-without-version-string/$(git describe)/" common/options/options.go
+        sed -i.bak "s/built-without-git-spec/$(git rev-parse HEAD)/" common/options/options.go
+
+        . ./set_gopath.sh
+        ${gorootvars} go version
+        ${gorootvars} env | grep ^GO
+        ${gorootvars} go build ${args} -tags "failpoints ${build_tags}" -o bin/${tool} ${tool}/main/${tool}.go
+        ./bin/${tool} --version
+
+  "fetch tool" :
+    command: s3.get
+    params:
+      bucket: mciuploads
+      aws_key: ${aws_key}
+      aws_secret: ${aws_secret}
+      local_file: src/bin/${tool}${extension}
+      remote_file: mongo-tools/binaries/${build_id}/${edition|community}/${tool}${extension}
+
+  "upload tool":
+    command: s3.put
+    params:
+      aws_key: ${aws_key}
+      aws_secret: ${aws_secret}
+      local_file: src/bin/${tool}
+      remote_file: mongo-tools/binaries/${build_id}/${edition|community}/${tool}${extension}
+      bucket: mciuploads
+      permissions: public-read
+      content_type: application/octet-stream
+      display_name: ${tool}
+
+  "fetch source" :
+    - command: git.get_project
+      params:
+        directory: src
+    - command: git.apply_patch
+      params:
+        directory: src
+    - command: shell.exec
+      params:
+        working_dir: src
+        script: |
+          set -x
+          set -v
+          set -e
+          mkdir -p bin
+
+  "test_atlas_dump" :
+    - command: shell.exec
+      type: test
+      params:
+        working_dir: src
+        script: |
+          set -x
+          set -v
+          set -e
+          chmod +x ./bin/mongodump
+          ./bin/mongodump --uri="${uri}" -v
+
+timeout:
+  - command: shell.exec
+    params:
+      silent: true
+      script: |
+        set -x
+          set -v
+        # don't attempt to abort on any distro which has a special way of
+        # killing everything (i.e. using taskkill on Windows)
+        if [ "${killall_mci}" = "" ]; then
+          all_tools="bsondump mongodump mongoexport mongofiles mongoimport mongorestore mongostat mongotop"
+          # send SIGABRT to print a stacktrace for any hung tool
+          pkill -ABRT "^($(echo -n $all_tools | tr ' ' '|'))\$"
+          # git the processes a second or two to dump their stacks
+          sleep 10
+        fi
+
+tasks:
+
+  - name: dist
+    depends_on:
+    commands:
+      - func: "fetch source"
+      # mongodump
+      - func: "build tool"
+        vars:
+          tool: mongodump
+      - func: "upload tool"
+        vars:
+          tool: mongodump
+
+  - name: test_atlas_free
+    commands:
+      - func: "fetch tool"
+        vars:
+          tool: mongodump
+      - func: test_atlas_dump
+        vars:
+          uri: '${atlas_free}'
+    depends_on:
+      - name: dist
+  - name: test_atlas_replica
+    commands:
+      - func: "fetch tool"
+        vars:
+          tool: mongodump
+      - func: test_atlas_dump
+        vars:
+          uri: '${atlas_replica}'
+    depends_on:
+      - name: dist
+  - name: test_atlas_sharded
+    commands:
+      - func: "fetch tool"
+        vars:
+          tool: mongodump
+      - func: test_atlas_dump
+        vars:
+          uri: '${atlas_sharded}'
+    depends_on:
+      - name: dist
+  - name: test_atlas_tls11
+    commands:
+      - func: "fetch tool"
+        vars:
+          tool: mongodump
+      - func: test_atlas_dump
+        vars:
+          uri: '${atlas_tls11}'
+    depends_on:
+      - name: dist
+  - name: test_atlas_tls12
+    commands:
+      - func: "fetch tool"
+        vars:
+          tool: mongodump
+      - func: test_atlas_dump
+        vars:
+          uri: '${atlas_tls12}'
+    depends_on:
+      - name: dist
+
+buildvariants:
+
+#######################################
+#     Amazon x86_64 Buildvariants     #
+#######################################
+
+- name: amazonlinux64
+  display_name: Amazon Linux 64 (Go 1.10)
+  run_on:
+  - linux-64-amzn-test
+  expansions:
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "sasl ssl"
+  tasks: *atlas_live_tasks
+
+- name: amazon2
+  display_name: Amazon Linux 64 v2 (Go 1.10)
+  run_on:
+  - amazon2-test
+  expansions:
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "sasl ssl"
+  tasks: *atlas_live_tasks
+
+#######################################
+#     Debian x86_64 Buildvariants     #
+#######################################
+
+- name: debian81
+  display_name: Debian 8.1 (Go 1.10)
+  run_on:
+  - debian81-test
+  expansions:
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "sasl ssl"
+  tasks: *atlas_live_tasks
+
+- name: debian92
+  display_name: Debian 9.2 (Go 1.10)
+  run_on:
+  - debian92-test
+  expansions:
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "sasl ssl"
+  tasks: *atlas_live_tasks
+
+#######################################
+#           macOS Buildvariant        #
+#######################################
+
+- name: macOS-1012-ssl
+  display_name: MacOS 10.12 SSL (Go 1.10)
+  run_on:
+  - macos-1012
+  expansions:
+    build_tags: "ssl openssl_pre_1.0"
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+  tasks: *atlas_live_tasks
+
+#######################################
+#     RHEL x86_64 Buildvariants       #
+#######################################
+
+- name: rhel62
+  display_name: RHEL 6.2 (Go 1.10)
+  run_on:
+  - rhel62-test
+  expansions:
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "sasl ssl"
+  tasks: *atlas_live_tasks
+
+- name: rhel70
+  display_name: RHEL 7.0 (Go 1.10)
+  run_on:
+  - rhel70
+  expansions:
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "sasl ssl"
+  tasks: *atlas_live_tasks
+
+#######################################
+#     SUSE x86_64 Buildvariants       #
+#######################################
+
+- name: suse12
+  display_name: SUSE 12 (Go 1.10)
+  run_on:
+  - suse12-test
+  expansions:
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "sasl ssl"
+  tasks: *atlas_live_tasks
+
+#######################################
+#    Ubuntu x86_64 Buildvariants      #
+#######################################
+
+- name: ubuntu1404-ssl
+  display_name: Ubuntu 14.04 SSL (Go 1.10)
+  run_on:
+  - ubuntu1404-test
+  expansions:
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "sasl ssl"
+  tasks: *atlas_live_tasks
+
+- name: ubuntu1604
+  display_name: Ubuntu 16.04 (Go 1.10)
+  run_on:
+  - ubuntu1604-test
+  expansions:
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "sasl ssl"
+  tasks: *atlas_live_tasks
+
+#######################################
+#        Windows Buildvariants        #
+#######################################
+
+- name: windows-64-ssl
+  display_name: Windows 64-bit SSL (Go 1.10)
+  run_on:
+  - windows-64-vs2013-compile
+  expansions:
+    build_tags: "ssl"
+    gorootvars: 'PATH="/cygdrive/c/golang/go1.10/bin:/cygdrive/c/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin:$PATH" GOROOT="c:/golang/go1.10"'
+  tasks: *atlas_live_tasks
+
+#######################################
+#        ARM Buildvariants            #
+#######################################
+
+- name: ubuntu1604-arm64
+  display_name: ZAP ARM64 Ubuntu 16.04 SSL (Go 1.10)
+  run_on:
+  - ubuntu1604-arm64-small
+  stepback: false
+  batchtime: 10080 # weekly
+  expansions:
+    build_tags: "ssl"
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CC=/opt/mongodbtoolchain/v2/bin/aarch64-mongodb-linux-gcc'
+  tasks: *atlas_live_tasks
+
+#######################################
+#        Power Buildvariants          #
+#######################################
+
+- name: rhel71-ppc64le-enterprise
+  display_name: ZAP PPC64LE RHEL 7.1 Enterprise (Go 1.10)
+  run_on:
+  - rhel71-power8-test
+  stepback: false
+  batchtime: 10080 # weekly
+  expansions:
+    build_tags: 'ssl'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CC=/opt/mongodbtoolchain/v2/bin/ppc64le-mongodb-linux-gcc'
+  tasks: *atlas_live_tasks
+
+- name: ubuntu1604-ppc64le-enterprise
+  display_name: ZAP PPC64LE Ubuntu 16.04 Enterprise (Go 1.10)
+  run_on:
+  - ubuntu1604-power8-test
+  stepback: false
+  batchtime: 10080 # weekly
+  expansions:
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CC=/opt/mongodbtoolchain/v2/bin/ppc64le-mongodb-linux-gcc'
+    build_tags: 'ssl sasl'
+  tasks: *atlas_live_tasks
+
+#######################################
+#     Z (s390x) Buildvariants         #
+#######################################
+
+- name: rhel67-s390x-enterprise
+  display_name: ZAP s390x RHEL 6.7 Enterprise (Go 1.10)
+  run_on:
+  - rhel67-zseries-test
+  stepback: false
+  batchtime: 10080 # weekly
+  expansions:
+    build_tags: "sasl ssl"
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CC=/opt/mongodbtoolchain/v2/bin/s390x-mongodb-linux-gcc'
+  tasks: *atlas_live_tasks
+
+- name: ubuntu1604-s390x-enterprise
+  display_name: ZAP s390x Ubuntu 16.04 Enterprise (Go 1.10)
+  run_on:
+  - ubuntu1604-zseries-small
+  stepback: false
+  batchtime: 10080 # weekly
+  expansions:
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CC=/opt/mongodbtoolchain/v2/bin/s390x-mongodb-linux-gcc'
+    build_tags: "sasl ssl"
+  tasks: *atlas_live_tasks
diff --git a/src/mongo/gotools/common.yml b/src/mongo/gotools/common.yml
index b54f943cefa..856c7e23038 100644
--- a/src/mongo/gotools/common.yml
+++ b/src/mongo/gotools/common.yml
@@ -11,14 +11,11 @@ mongo_tools_variables:
 
 ## List of tests to run on each buildvariant
   mongo_tools_task_lists:
-    mac_1012_task_list: &macos_1012_tasks
+    mac_task_list: &macos_tasks
       - name: db
       - name: dist
       - name: integration
       - name: integration-auth
-      - name: legacy30
-#      No SSL on 2.6 for osx
-#      - name: legacy26
       - name: qa-tests-3.2
       - name: qa-tests-3.4
       - name: qa-tests-3.6
@@ -35,15 +32,16 @@ mongo_tools_variables:
       - name: replay-auth_test
       - name: replay-sharded_test
       - name: replay-repl_test
-      - name: replay-replay_test
-    macos_1012_ssl_task_list: &macos_1012_ssl_tasks
+      # Disabled due to TOOLS-2107
+      # - name: replay-replay_test
+    macos_ssl_task_list: &macos_ssl_tasks
       - name: dist
       - name: qa-tests-4.0
       - name: qa-tests-unstable
       - name: native-cert-ssl
       - name: unit
       - name: replay-dist
-    ubuntu1404_x86_64_task_list: &ubuntu1404_x86_64_tasks
+    rhel_x86_64_task_list: &rhel_x86_64_tasks
       - name: db
       - name: dist
       - name: integration
@@ -68,24 +66,74 @@ mongo_tools_variables:
       - name: replay-auth_test
       - name: replay-sharded_test
       - name: replay-repl_test
-      - name: replay-replay_test
-    ubuntu1404_x86_64_ssl_task_list: &ubuntu1404_x86_64_ssl_tasks
+      # Disabled due to TOOLS-2116
+      # - name: replay-replay_test
+    rhel_x86_64_ssl_task_list: &rhel_x86_64_ssl_tasks
+      - name: dist
+      - name: integration
+      - name: integration-auth
+      - name: qa-tests-4.0
+      - name: qa-tests-unstable
+      - name: native-cert-ssl
+      - name: replay-dist
+    rhel_x86_64_enterprise_task_list: &rhel_x86_64_enterprise_tasks
+      - name: db
+      - name: dist
+      - name: integration
+      - name: integration-auth
+      # Disabled due to TOOLS-2119
+      # - name: kerberos
+      - name: qa-tests-4.0
+      - name: qa-tests-unstable
+      - name: native-cert-ssl
+      - name: replay-dist
+      - name: replay-sanity_check
+      - name: replay-go_test
+      - name: replay-auth_test
+      - name: replay-sharded_test
+      - name: replay-repl_test
+      # Disabled due to TOOLS-2116
+      # - name: replay-replay_test
+    ubuntu_x86_64_task_list: &ubuntu_x86_64_tasks
+      - name: db
+      - name: dist
+      - name: integration
+      - name: integration-auth
+      - name: lint-go
+      - name: lint-js
+      - name: qa-tests-3.2
+      - name: qa-tests-3.4
+      - name: qa-tests-3.6
+      - name: qa-tests-4.0
+      - name: qa-tests-unstable
+      - name: qa-dump-restore-gzip
+      - name: qa-dump-restore-gzip-3.2
+      - name: qa-dump-restore-archiving
+      - name: qa-dump-restore-archiving-3.2
+      - name: unit
+      - name: vet
+      - name: replay-dist
+      - name: replay-sanity_check
+      - name: replay-go_test
+      - name: replay-auth_test
+      - name: replay-sharded_test
+      - name: replay-repl_test
+      # Disabled due to TOOLS-2108
+      # - name: replay-replay_test
+    ubuntu_x86_64_ssl_task_list: &ubuntu_x86_64_ssl_tasks
       - name: dist
       - name: integration
       - name: integration-auth
-      - name: legacy30
       - name: qa-tests-4.0
       - name: qa-tests-unstable
       - name: native-cert-ssl
       - name: replay-dist
-    ubuntu1404_x86_64_enterprise_task_list: &ubuntu1404_x86_64_enterprise_tasks
+    ubuntu_x86_64_enterprise_task_list: &ubuntu_x86_64_enterprise_tasks
       - name: db
       - name: dist
       - name: integration
       - name: integration-auth
       - name: kerberos
-      - name: legacy30
-      - name: legacy26
       - name: qa-tests-4.0
       - name: qa-tests-unstable
       - name: native-cert-ssl
@@ -95,14 +143,13 @@ mongo_tools_variables:
       - name: replay-auth_test
       - name: replay-sharded_test
       - name: replay-repl_test
-      - name: replay-replay_test
-    ubuntu1404_x86_64_race_task_list: &ubuntu1404_x86_64_race_tasks
+      # Disabled due to TOOLS-2108
+      # - name: replay-replay_test
+    ubuntu_x86_64_race_task_list: &ubuntu_x86_64_race_tasks
       - name: db
       - name: dist
       - name: integration
       - name: integration-auth
-      - name: legacy30
-      - name: legacy26
       - name: qa-tests-4.0
       - name: unit
       - name: replay-dist
@@ -111,13 +158,13 @@ mongo_tools_variables:
       - name: replay-auth_test
       - name: replay-sharded_test
       - name: replay-repl_test
-      - name: replay-replay_test
+      # Disabled due to TOOLS-2108
+      # - name: replay-replay_test
     windows_64_task_list: &windows_64_tasks
       - name: db
       - name: dist
       - name: integration
       - name: integration-auth
-      - name: legacy30
         distros:
         - windows-64-vs2013-test
       - name: qa-tests-3.2
@@ -150,7 +197,6 @@ mongo_tools_variables:
       - name: dist
       - name: integration
       - name: integration-auth
-      - name: legacy30
       - name: qa-tests-4.0
       - name: qa-tests-unstable
       - name: native-cert-ssl
@@ -161,7 +207,6 @@ mongo_tools_variables:
       - name: integration
       - name: integration-auth
       - name: kerberos
-      - name: legacy30
         distros:
         - windows-64-vs2013-test
       - name: qa-tests-3.2
@@ -200,13 +245,15 @@ mongo_tools_variables:
       - name: replay-auth_test
       - name: replay-sharded_test
       - name: replay-repl_test
-      - name: replay-replay_test
+      # Disabled due to TOOLS-2108
+      # - name: replay-replay_test
     rhel67_s390x_enterprise_task_list: &rhel67_s390x_enterprise_tasks
       - name: db
       - name: dist
       - name: integration
       - name: integration-auth
-      - name: kerberos
+      # Disabled due to TOOLS-2119
+      # - name: kerberos
       - name: qa-dump-restore-archiving
       - name: qa-dump-restore-gzip
       - name: qa-tests-3.4
@@ -220,7 +267,8 @@ mongo_tools_variables:
       - name: replay-auth_test
       - name: replay-sharded_test
       - name: replay-repl_test
-      - name: replay-replay_test
+      # Disabled due to TOOLS-2108
+      # - name: replay-replay_test
     ubuntu1604_arm64_ssl_task_list: &ubuntu1604_arm64_ssl_tasks
       - name: db
       - name: dist
@@ -284,14 +332,9 @@ functions:
         chmod +x bin/*
         mv bin/* test/qa-tests/
         cd test/qa-tests
-        rm -rf /data/mci/install /data/mci/multiversion
-        mkdir -p /data/mci/install /data/mci/multiversion
-        if [ "${multiversion_override}" != "skip" ]; then
-          python buildscripts/setup_multiversion_mongodb.py /data/mci/install /data/mci/multiversion ${arch} ${multiversion_override|2.6} --latest ${smoke_use_ssl} --os="${mongo_os}"
-        fi
         chmod 400 jstests/libs/key*
 
-        PATH=$PATH:/data/mci/multiversion python buildscripts/resmoke.py --suite=${resmoke_suite} --continueOnFailure --log=buildlogger --reportFile=../../report.json ${resmoke_args} --excludeWithAnyTags="${excludes}"
+        python buildscripts/resmoke.py --suite=${resmoke_suite} --continueOnFailure --log=buildlogger --reportFile=../../report.json ${resmoke_args} --excludeWithAnyTags="${excludes}"
 
   "build tool":
     command: shell.exec
@@ -400,13 +443,14 @@ functions:
     params:
       working_dir: src
       script: |
+        # export sensitive info before `set -x`
+        export MONGODB_KERBEROS_PASSWORD=${kerberos_password}
         set -x
         set -v
         if [ "Windows_NT" = "$OS" ]; then
             set -o igncr
         fi;
         . ./set_gopath.sh
-        export MONGODB_KERBEROS_PASSWORD=${kerberos_password}
         export basedir=$PWD
         cd ${package}
         ${gorootvars} go test ${coverage_args} ${args} -tags "${build_tags}" -test.v > unit.suite
@@ -422,13 +466,21 @@ functions:
       # Set up Kerberos stuff: run kinit if necessary, and add KDC to registry
       # on Windows (see https://wiki.mongodb.com/display/DH/Testing+Kerberos)
       script: |
-        set -x
-        set -v
         set -e
-        if [ '${run_kinit}' = 'true' ]
-        then
-          echo "${kerberos_password}" | kinit -p drivers@LDAPTEST.10GEN.CC;
+        # export sensitive info before `set -x`
+        if [ '${run_kinit}' = 'true' ]; then
+            # BUILD-3830
+            mkdir -p "$(pwd)/.evergreen"
+            touch "$(pwd)/.evergreen/krb5.conf.empty"
+            export KRB5_CONFIG="$(pwd)/.evergreen/krb5.conf.empty"
+
+            echo "Writing keytab"
+            echo ${kerberos_keytab} | base64 -d > "$(pwd)/.evergreen/drivers.keytab"
+            echo "Running kinit"
+            kinit -k -t "$(pwd)/.evergreen/drivers.keytab" -p drivers@LDAPTEST.10GEN.CC;
         fi;
+        set -x
+        set -v
         if [ "Windows_NT" = "$OS" ]; then
           cmd /c "REG ADD HKLM\SYSTEM\ControlSet001\Control\Lsa\Kerberos\Domains\LDAPTEST.10GEN.CC /v KdcNames /d ldaptest.10gen.cc /t REG_MULTI_SZ /f"
         fi;
@@ -497,12 +549,13 @@ functions:
     params:
       working_dir: src
       script: |
-        set -x
-        set -v
+        # export sensitive info before `set -x`
         if [ "Windows_NT" = "$OS" ]; then
             set -o igncr
             export MONGODB_KERBEROS_PASSWORD=${kerberos_password}
         fi;
+        set -x
+        set -v
         . ./set_gopath.sh
 
         if [ "${create_mongod_users_command}" != "" ]; then
@@ -818,8 +871,6 @@ post:
         set -x
           set -v
         rm -rf /data/db/*
-        rm -rf /data/mci/multiversion
-        rm -rf /data/mci/install
         exit 0
 
 timeout:
@@ -1004,39 +1055,6 @@ tasks:
         test_path: "test/legacy30"
         smoke_args: "--authMechanism SCRAM-SHA-1"
 
-- name: legacy26
-  depends_on:
-  - name: dist
-  commands:
-    - func: "fetch source"
-    - func: "get buildnumber"
-    - func: "setup credentials"
-    - func: "download mongod"
-      vars:
-        mongo_version: "2.6"
-    - func: "fetch tool"
-      vars:
-        tool: mongoimport
-    - func: "fetch tool"
-      vars:
-        tool: mongoexport
-    - func: "fetch tool"
-      vars:
-        tool: mongodump
-    - func: "fetch tool"
-      vars:
-        tool: mongostat
-    - func: "fetch tool"
-      vars:
-        tool: mongorestore
-    - func: "fetch tool"
-      vars:
-        tool: mongofiles
-    - func: "run legacy tests"
-      vars:
-        test_path: "test/legacy26"
-        smoke_use_ssl: ""
-
 - name: lint-go
   commands:
     - func: "fetch source"
@@ -1103,6 +1121,7 @@ tasks:
     - func: "run qa-tests"
       vars:
         resmoke_suite: "core${resmoke_use_ssl}"
+        excludes: "requires_mongo_26,${excludes}"
 
 - name: qa-tests-4.0
   depends_on:
@@ -1141,7 +1160,7 @@ tasks:
     - func: "run qa-tests"
       vars:
         resmoke_suite: "core${resmoke_use_ssl}"
-        excludes: "requires_unstable,${excludes}"
+        excludes: "requires_mongo_26,requires_unstable,${excludes}"
 
 - name: qa-tests-3.6
   depends_on:
@@ -1180,7 +1199,7 @@ tasks:
     - func: "run qa-tests"
       vars:
         resmoke_suite: "core${resmoke_use_ssl}"
-        excludes: "requires_unstable,${excludes}"
+        excludes: "requires_mongo_26,requires_mongo_40,requires_unstable,${excludes}"
 
 - name: qa-tests-3.4
   depends_on:
@@ -1219,7 +1238,7 @@ tasks:
     - func: "run qa-tests"
       vars:
         resmoke_suite: "core${resmoke_use_ssl}"
-        excludes: "requires_unstable,requires_mongo_36,${excludes}"
+        excludes: "requires_mongo_26,requires_mongo_36,requires_mongo_40,requires_unstable,${excludes}"
 
 - name: qa-tests-3.2
   depends_on:
@@ -1258,7 +1277,7 @@ tasks:
     - func: "run qa-tests"
       vars:
         resmoke_suite: "core${resmoke_use_ssl}"
-        excludes: "requires_unstable,requires_mongo_34,requires_mongo_36,${excludes}"
+        excludes: "requires_mongo_26,requires_mongo_34,requires_mongo_36,requires_mongo_40,requires_unstable,,${excludes}"
 
 - name: native-cert-ssl
   depends_on:
@@ -1304,11 +1323,8 @@ tasks:
           set -e
           chmod +x ../../bin/*
           mv ../../bin/* .
-          rm -rf /data/mci/install /data/mci/multiversion
-          mkdir -p /data/mci/install /data/mci/multiversion
-          python buildscripts/setup_multiversion_mongodb.py /data/mci/install /data/mci/multiversion ${arch} "2.6" --latest ${smoke_use_ssl} --os="${mongo_os}" || true
           chmod 400 jstests/libs/key*
-          PATH=$PATH:/data/mci/multiversion python buildscripts/resmoke.py --suite=native_cert_ssl  --continueOnFailure --log=buildlogger --reportFile=../../report.json ${resmoke_args} --excludeWithAnyTags="${excludes}"
+          python buildscripts/resmoke.py --suite=native_cert_ssl  --continueOnFailure --log=buildlogger --reportFile=../../report.json ${resmoke_args} --excludeWithAnyTags="${excludes}"
 
 - name: qa-dump-restore-archiving
   depends_on:
@@ -1329,7 +1345,7 @@ tasks:
     - func: "run qa-tests"
       vars:
         resmoke_suite: "restore_archive"
-        excludes: "requires_unstable,${excludes}"
+        excludes: "requires_mongo_26,requires_unstable,${excludes}"
 
 - name: qa-dump-restore-archiving-3.2
   depends_on:
@@ -1350,7 +1366,7 @@ tasks:
     - func: "run qa-tests"
       vars:
         resmoke_suite: "restore_archive"
-        excludes: "requires_unstable,requires_mongo_34,requires_mongo_36,${excludes}"
+        excludes: "requires_mongo_26,requires_mongo_34,requires_mongo_36,requires_mongo_40,requires_unstable,${excludes}"
 
 - name: qa-dump-restore-gzip
   depends_on:
@@ -1371,7 +1387,7 @@ tasks:
     - func: "run qa-tests"
       vars:
         resmoke_suite: "restore_gzip"
-        excludes: "requires_unstable,${excludes}"
+        excludes: "requires_mongo_26,requires_unstable,${excludes}"
 
 - name: qa-dump-restore-gzip-3.2
   depends_on:
@@ -1392,7 +1408,7 @@ tasks:
     - func: "run qa-tests"
       vars:
         resmoke_suite: "restore_gzip"
-        excludes: "requires_unstable,requires_mongo_34,requires_mongo_36,${excludes}"
+        excludes: "requires_mongo_26,requires_mongo_34,requires_mongo_36,requires_mongo_40,requires_unstable,${excludes}"
 
 - name: unit
   commands:
@@ -1701,7 +1717,7 @@ buildvariants:
     arch: "osx/x86_64"
     excludes: requires_many_files
     gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
-  tasks: *macos_1012_tasks
+  tasks: *macos_tasks
 
 - name: macOS-1012-ssl
   display_name: MacOS 10.12 SSL (Go 1.10)
@@ -1716,7 +1732,7 @@ buildvariants:
     build_tags: "ssl openssl_pre_1.0"
     excludes: requires_many_files
     gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
-  tasks: *macos_1012_ssl_tasks
+  tasks: *macos_ssl_tasks
 
 #######################################
 #     RHEL x86_64 Buildvariants       #
@@ -1727,11 +1743,55 @@ buildvariants:
   run_on:
   - rhel62-test
   expansions:
+    <<: *mongod_default_startup_args
+    <<: *mongo_default_startup_args
+    mongo_os: "rhel62"
+    mongo_edition: "targeted"
     gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "sasl ssl"
-  tasks:
-  - name: dist
-  - name: replay-dist
+    arch: "linux/x86_64"
+    integration_test_args: integration
+    resmoke_args: --jobs $(grep -c ^processor /proc/cpuinfo)
+  tasks: *rhel_x86_64_tasks
+
+- name: rhel62-ssl
+  display_name: RHEL 6.2 SSL (Go 1.10)
+  run_on:
+  - rhel62-test
+  expansions:
+    <<: *mongod_ssl_startup_args
+    <<: *mongo_ssl_startup_args
+    mongo_os: "rhel62"
+    mongo_edition: "enterprise"
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "sasl ssl"
+    edition: ssl
+    arch: "linux/x86_64"
+    smoke_use_ssl: --use-ssl
+    resmoke_use_ssl: _ssl
+    resmoke_args: --jobs $(grep -c ^processor /proc/cpuinfo)
+    integration_test_args: "integration,ssl"
+  tasks: *rhel_x86_64_ssl_tasks
+
+- name: rhel62-enterprise
+  display_name: RHEL 6.2 Enterprise (Go 1.10)
+  run_on:
+  - rhel62-test
+  expansions:
+    <<: *mongod_default_startup_args
+    <<: *mongo_default_startup_args
+    mongo_os: "rhel62"
+    mongo_edition: "enterprise"
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "ssl sasl"
+    smoke_use_ssl: --use-ssl
+    resmoke_use_ssl: _ssl
+    arch: "linux/x86_64"
+    edition: enterprise
+    run_kinit: true
+    integration_test_args: integration
+    resmoke_args: --jobs $(grep -c ^processor /proc/cpuinfo)
+  tasks: *rhel_x86_64_enterprise_tasks
 
 - name: rhel70
   display_name: RHEL 7.0 (Go 1.10)
@@ -1768,25 +1828,36 @@ buildvariants:
   run_on:
   - ubuntu1404-test
   expansions:
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "sasl ssl"
+  tasks:
+  - name: dist
+  - name: replay-dist
+
+- name: ubuntu1604
+  display_name: Ubuntu 16.04 (Go 1.10)
+  run_on:
+  - ubuntu1604-test
+  expansions:
     <<: *mongod_default_startup_args
     <<: *mongo_default_startup_args
-    mongo_os: "ubuntu1404"
+    mongo_os: "ubuntu1604"
     mongo_edition: "targeted"
     gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "sasl ssl"
     arch: "linux/x86_64"
     integration_test_args: integration
     resmoke_args: --jobs $(grep -c ^processor /proc/cpuinfo)
-  tasks: *ubuntu1404_x86_64_tasks
+  tasks: *ubuntu_x86_64_tasks
 
-- name: ubuntu1404-ssl
-  display_name: Ubuntu 14.04 SSL (Go 1.10)
+- name: ubuntu1604-ssl
+  display_name: Ubuntu 16.04 SSL (Go 1.10)
   run_on:
-  - ubuntu1404-test
+  - ubuntu1604-test
   expansions:
     <<: *mongod_ssl_startup_args
     <<: *mongo_ssl_startup_args
-    mongo_os: "ubuntu1404"
+    mongo_os: "ubuntu1604"
     mongo_edition: "enterprise"
     gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "sasl ssl"
@@ -1796,16 +1867,16 @@ buildvariants:
     resmoke_use_ssl: _ssl
     resmoke_args: --jobs $(grep -c ^processor /proc/cpuinfo)
     integration_test_args: "integration,ssl"
-  tasks: *ubuntu1404_x86_64_ssl_tasks
+  tasks: *ubuntu_x86_64_ssl_tasks
 
-- name: ubuntu1404-enterprise
-  display_name: Ubuntu 14.04 Enterprise (Go 1.10)
+- name: ubuntu1604-enterprise
+  display_name: Ubuntu 16.04 Enterprise (Go 1.10)
   run_on:
-  - ubuntu1404-test
+  - ubuntu1604-test
   expansions:
     <<: *mongod_default_startup_args
     <<: *mongo_default_startup_args
-    mongo_os: "ubuntu1404"
+    mongo_os: "ubuntu1604"
     mongo_edition: "enterprise"
     gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "ssl sasl"
@@ -1816,12 +1887,12 @@ buildvariants:
     run_kinit: true
     integration_test_args: integration
     resmoke_args: --jobs $(grep -c ^processor /proc/cpuinfo)
-  tasks: *ubuntu1404_x86_64_enterprise_tasks
+  tasks: *ubuntu_x86_64_enterprise_tasks
 
-- name: ubuntu1604
-  display_name: Ubuntu 16.04 (Go 1.10)
+- name: ubuntu1804
+  display_name: Ubuntu 18.04 (Go 1.10)
   run_on:
-  - ubuntu1604-test
+  - ubuntu1804-test
   expansions:
     gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "sasl ssl"
@@ -1866,7 +1937,6 @@ buildvariants:
     resmoke_use_ssl: _ssl
     resmoke_args: --jobs $(grep -c ^processor /proc/cpuinfo)
     excludes: requires_large_ram,requires_mongo_24
-    multiversion_override: "2.6"
     extension: .exe
     arch: "win32/x86_64"
     gorootvars: 'PATH="/cygdrive/c/golang/go1.10/bin:/cygdrive/c/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin:$PATH" GOROOT="c:/golang/go1.10"'
@@ -1889,7 +1959,6 @@ buildvariants:
     resmoke_args: --jobs $(grep -c ^processor /proc/cpuinfo)
     resmoke_use_ssl: _ssl
     excludes: requires_large_ram,requires_mongo_24
-    multiversion_override: "2.6"
     edition: enterprise
     extension: .exe
     arch: "win32/x86_64"
@@ -1919,7 +1988,6 @@ buildvariants:
     gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CC=/opt/mongodbtoolchain/v2/bin/aarch64-mongodb-linux-gcc'
     excludes: requires_mmap_available,requires_large_ram,requires_mongo_24,requires_mongo_26,requires_mongo_30
     resmoke_args: -j 2
-    multiversion_override: "skip"
     arch: "linux/arm64"
     edition: ssl
     integration_test_args: integration
@@ -1948,7 +2016,6 @@ buildvariants:
     gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CC=/opt/mongodbtoolchain/v2/bin/ppc64le-mongodb-linux-gcc'
     resmoke_args: -j 4
     excludes: requires_mmap_available,requires_large_ram,requires_mongo_24,requires_mongo_26,requires_mongo_30
-    multiversion_override: "skip"
     arch: "linux/ppc64le"
     edition: enterprise
     run_kinit: true
@@ -1989,7 +2056,6 @@ buildvariants:
     gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CC=/opt/mongodbtoolchain/v2/bin/s390x-mongodb-linux-gcc'
     excludes: requires_mmap_available,requires_mongo_24,requires_mongo_26,requires_mongo_30
     resmoke_args: -j 2
-    multiversion_override: "skip"
     arch: "linux/s390x"
     edition: enterprise
     run_kinit: true
@@ -2016,13 +2082,13 @@ buildvariants:
 - name: ubuntu-race
   stepback: false
   batchtime: 1440 # daily
-  display_name: z Race Detector Ubuntu 14.04 (Go 1.10)
+  display_name: z Race Detector Ubuntu 16.04 (Go 1.10)
   run_on:
-  - ubuntu1404-test
+  - ubuntu1604-test
   expansions:
     <<: *mongod_default_startup_args
     <<: *mongo_default_startup_args
-    mongo_os: "ubuntu1404"
+    mongo_os: "ubuntu1604"
     mongo_edition: "enterprise"
     gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "sasl ssl"
@@ -2030,5 +2096,5 @@ buildvariants:
     args: "-race"
     excludes: requires_large_ram
     integration_test_args: integration
-  tasks: *ubuntu1404_x86_64_race_tasks
+  tasks: *ubuntu_x86_64_race_tasks
 
diff --git a/src/mongo/gotools/common/lldb/db.go b/src/mongo/gotools/common/lldb/db.go
index a3397baff56..f7f60c758f4 100644
--- a/src/mongo/gotools/common/lldb/db.go
+++ b/src/mongo/gotools/common/lldb/db.go
@@ -4,15 +4,15 @@
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 
-// Package db implements generic connection to MongoDB, and contains
+// Package lldb implements generic connection to MongoDB, and contains
 // subpackages for specific methods of connection.
 package lldb
 
 import (
-	"github.com/mongodb/mongo-tools/common/options"
-	"github.com/mongodb/mongo-tools/common/password"
 	mgo "github.com/10gen/llmgo"
 	"github.com/10gen/llmgo/bson"
+	"github.com/mongodb/mongo-tools/common/options"
+	"github.com/mongodb/mongo-tools/common/password"
 
 	"fmt"
 	"io"
diff --git a/src/mongo/gotools/import.data b/src/mongo/gotools/import.data
index d59a8e57105..5aa006c9b7d 100644
--- a/src/mongo/gotools/import.data
+++ b/src/mongo/gotools/import.data
@@ -1,5 +1,5 @@
 {
-    "commit": "5f036603357e3d910e4d765369261fd0b577dd59", 
+    "commit": "e914484acd3a6e6f0c384de565a5d353d67aed52", 
     "github": "mongodb/mongo-tools.git", 
     "vendor": "tools", 
     "branch": "v4.1"