From eeab3a93bdb4e8edfb51e9032f966edb310dc547 Mon Sep 17 00:00:00 2001 From: Max Hirschhorn Date: Sat, 28 Apr 2018 19:57:20 -0400 Subject: SERVER-34605 Move Jepsen tasks to Ubuntu 16.04 builders. (cherry picked from commit e85ee4e1e4de3b11ab51dc3e8cc624e9e1dd02bb) --- etc/evergreen.yml | 103 ++++++++++++++++++++++++------------------------------ 1 file changed, 45 insertions(+), 58 deletions(-) diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 318ec8b3d75..1a80588e5d5 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -583,13 +583,7 @@ functions: working_dir: src script: | set -o errexit - ${activate_virtualenv} - $python -c 'import socket; num_nodes = 5; print("\n".join(["%s:%d" % (socket.gethostname(), port) for port in range(20000, 20000 + num_nodes)]))' > nodes.txt - - if [ ${distro_id} = "ubuntu1404-jepsen" ]; then - ${set_sudo} - $sudo apt-get install -y --force-yes libc++-dev libsnmp-dev - fi + ${python|/opt/mongodbtoolchain/v2/bin/python2} -c 'import socket; num_nodes = 5; print("\n".join(["%s:%d" % (socket.gethostname(), port) for port in range(20000, 20000 + num_nodes)]))' > nodes.txt "run jepsen test" : - command: shell.exec @@ -1206,21 +1200,14 @@ timeout: script: | set -o verbose - # We run the hang_analyzer.py script with root privileges when running the Jepsen tests in - # order to be able to attach to the mongod processes inside the LXC containers. - sudo= - if [ ${distro_id} = "ubuntu1404-jepsen" ]; then - ${set_sudo} - fi - hang_analyzer_option="-o file -o stdout -p ${hang_analyzer_processes|dbtest,java,mongo,mongod,mongos,python,_test} -g bsondump,mongodump,mongoexport,mongofiles,mongoimport,mongooplog,mongoreplay,mongorestore,mongostat,mongotop" if [ ${hang_analyzer_dump_core|true} = true ]; then hang_analyzer_option="-c $hang_analyzer_option" fi - echo "Calling the hang analyzer: PATH=\"/opt/mongodbtoolchain/gdb/bin:$PATH\" $sudo ${python|/opt/mongodbtoolchain/v2/bin/python2} buildscripts/hang_analyzer.py $hang_analyzer_option" - PATH="/opt/mongodbtoolchain/gdb/bin:$PATH" $sudo ${python|/opt/mongodbtoolchain/v2/bin/python2} buildscripts/hang_analyzer.py $hang_analyzer_option + echo "Calling the hang analyzer: PATH=\"/opt/mongodbtoolchain/gdb/bin:$PATH\" ${python|/opt/mongodbtoolchain/v2/bin/python2} buildscripts/hang_analyzer.py $hang_analyzer_option" + PATH="/opt/mongodbtoolchain/gdb/bin:$PATH" ${python|/opt/mongodbtoolchain/v2/bin/python2} buildscripts/hang_analyzer.py $hang_analyzer_option ####################################### # Tasks # @@ -3974,27 +3961,6 @@ buildvariants: - name: sharding_gle_auth_basics_passthrough_WT - name: sharding_gle_auth_basics_passthrough_write_cmd - name: sharding_gle_auth_basics_passthrough_write_cmd_WT - - name: jepsen_register_findAndModify_WT - distros: - - ubuntu1404-jepsen - - name: jepsen_register_findAndModify_pv0 - distros: - - ubuntu1404-jepsen - - name: jepsen_register_findAndModify_pv0_WT - distros: - - ubuntu1404-jepsen - - name: jepsen_register_linearizableRead - distros: - - ubuntu1404-jepsen - - name: jepsen_register_linearizableRead_WT - distros: - - ubuntu1404-jepsen - - name: jepsen_set_linearizableRead - distros: - - ubuntu1404-jepsen - - name: jepsen_set_linearizableRead_WT - distros: - - ubuntu1404-jepsen - name: jsCore - name: jsCore_WT - name: jsCore_auth @@ -4116,6 +4082,27 @@ buildvariants: - name: sharding_gle_auth_basics_passthrough_WT - name: sharding_gle_auth_basics_passthrough_write_cmd - name: sharding_gle_auth_basics_passthrough_write_cmd_WT + - name: jepsen_register_findAndModify_WT + distros: + - ubuntu1604-build + - name: jepsen_register_findAndModify_pv0 + distros: + - ubuntu1604-build + - name: jepsen_register_findAndModify_pv0_WT + distros: + - ubuntu1604-build + - name: jepsen_register_linearizableRead + distros: + - ubuntu1604-build + - name: jepsen_register_linearizableRead_WT + distros: + - ubuntu1604-build + - name: jepsen_set_linearizableRead + distros: + - ubuntu1604-build + - name: jepsen_set_linearizableRead_WT + distros: + - ubuntu1604-build - name: jsCore - name: jsCore_WT - name: jsCore_auth @@ -6719,27 +6706,6 @@ buildvariants: - name: dbtest - name: dbtest_WT - name: ese_WT - - name: jepsen_register_findAndModify_WT - distros: - - ubuntu1404-jepsen - - name: jepsen_register_findAndModify_pv0 - distros: - - ubuntu1404-jepsen - - name: jepsen_register_findAndModify_pv0_WT - distros: - - ubuntu1404-jepsen - - name: jepsen_register_linearizableRead - distros: - - ubuntu1404-jepsen - - name: jepsen_register_linearizableRead_WT - distros: - - ubuntu1404-jepsen - - name: jepsen_set_linearizableRead - distros: - - ubuntu1404-jepsen - - name: jepsen_set_linearizableRead_WT - distros: - - ubuntu1404-jepsen - name: jsCore - name: jsCore_auth - name: jstestfuzz @@ -6801,6 +6767,27 @@ buildvariants: - name: dbtest - name: dbtest_WT - name: ese_WT + - name: jepsen_register_findAndModify_WT + distros: + - ubuntu1604-build + - name: jepsen_register_findAndModify_pv0 + distros: + - ubuntu1604-build + - name: jepsen_register_findAndModify_pv0_WT + distros: + - ubuntu1604-build + - name: jepsen_register_linearizableRead + distros: + - ubuntu1604-build + - name: jepsen_register_linearizableRead_WT + distros: + - ubuntu1604-build + - name: jepsen_set_linearizableRead + distros: + - ubuntu1604-build + - name: jepsen_set_linearizableRead_WT + distros: + - ubuntu1604-build - name: jsCore - name: jsCore_auth - name: jstestfuzz -- cgit v1.2.1