Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .evergreen/config-atlas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -401,10 +401,6 @@ axes:
- id: "ruby"
display_name: Ruby Version
values:
- id: "ruby-1.9"
display_name: ruby-1.9
variables:
RVM_RUBY: "ruby-1.9"
- id: "ruby-2.3"
display_name: ruby-2.3
variables:
Expand Down
110 changes: 34 additions & 76 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -596,14 +596,6 @@ axes:
- id: "ruby"
display_name: Ruby Version
values:
- id: "ruby-1.9"
display_name: ruby-1.9
variables:
RVM_RUBY: "ruby-1.9"
- id: "ruby-2.2"
display_name: ruby-2.2
variables:
RVM_RUBY: "ruby-2.2"
- id: "ruby-2.3"
display_name: ruby-2.3
variables:
Expand All @@ -624,10 +616,6 @@ axes:
display_name: ruby-head
variables:
RVM_RUBY: "ruby-head"
# - id: "jruby-1.7"
# display_name: jruby-1.7
# variables:
# RVM_RUBY: "jruby-1.7"
- id: "jruby-9.1"
display_name: jruby-9.1
variables:
Expand All @@ -639,14 +627,12 @@ axes:
- id: "os"
display_name: OS
values:
- id: ubuntu1204-test
display_name: "Ubuntu 12.04"
run_on: ubuntu1204-test

- id: ubuntu1404
display_name: "Ubuntu 14.04"
run_on: ubuntu1404-test

- id: ubuntu1604
display_name: "Ubuntu 16.04"
run_on: ubuntu1604-test
- id: rhel70
display_name: "RHEL 7.0"
run_on: rhel70-small
Expand Down Expand Up @@ -703,34 +689,27 @@ axes:


buildvariants:
#- matrix_name: "all-os-all-ruby-auth-and-ssl-standalone"
# matrix_spec: { auth-and-ssl: "auth-and-ssl", ruby: "*", mongodb-version: "*", topology: "standalone", os: "*" }
# display_name: "${version} ${topology} ${auth-and-ssl} ${ruby} ${os}"
# tasks:
# - name: "test"
-
matrix_name: "ruby-min"
matrix_spec:
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
ruby: "ruby-1.9"
ruby: "ruby-2.3"
mongodb-version: "3.6"
topology: "*"
os: rhel70
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test"

-
matrix_name: "ruby-mid"
matrix_spec:
auth-and-ssl: "auth-and-ssl"
ruby: [ruby-2.2, ruby-2.3, ruby-2.4, ruby-2.5]
ruby: [ruby-2.4, ruby-2.5]
mongodb-version: "4.0"
topology: "*"
os: rhel70
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test"

Expand All @@ -741,9 +720,8 @@ buildvariants:
ruby: "ruby-2.6"
mongodb-version: "*"
topology: "*"
os: rhel70
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test"

Expand All @@ -755,9 +733,8 @@ buildvariants:
mongodb-version: ["4.2", latest]
topology: "sharded-cluster"
single-mongos: single-mongos
os: rhel70
display_name: "${mongodb-version} ${topology} single-mongos ${auth-and-ssl} ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test"

Expand All @@ -768,9 +745,8 @@ buildvariants:
ruby: "ruby-2.6"
mongodb-version: ["4.0"]
topology: "*"
os: rhel70
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test"

Expand All @@ -781,9 +757,8 @@ buildvariants:
ruby: "ruby-2.6"
mongodb-version: ["4.0"]
topology: "*"
os: rhel70
display_name: "${mongodb-version} ${topology} ${retry-reads} ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test"

Expand All @@ -794,9 +769,8 @@ buildvariants:
ruby: "ruby-2.6"
mongodb-version: ["4.0"]
topology: [replica-set, sharded-cluster]
os: rhel70
display_name: "${mongodb-version} ${topology} ${retry-writes} ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test"

Expand All @@ -807,9 +781,8 @@ buildvariants:
mongodb-version: [3.6, 4.0]
topology: '*'
storage-engine: mmapv1
os: rhel70
display_name: "${mongodb-version} ${topology} mmapv1 ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test-mlaunch"

Expand All @@ -820,9 +793,8 @@ buildvariants:
ruby: "ruby-2.6"
mongodb-version: ["4.0", "4.2"]
topology: [replica-set, sharded-cluster]
os: rhel70
display_name: "${mongodb-version} ${topology} ${lint} ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test"

Expand All @@ -833,9 +805,8 @@ buildvariants:
ruby: "jruby-9.2"
mongodb-version: "4.0"
topology: "*"
os: rhel70
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test"

Expand All @@ -846,9 +817,8 @@ buildvariants:
ruby: "jruby-9.1"
mongodb-version: "2.6"
topology: "*"
os: rhel70
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test"

Expand All @@ -857,35 +827,36 @@ buildvariants:
matrix_spec:
auth-and-ssl: "auth-and-ssl"
ruby: "ruby-2.6"
mongodb-version: "4.0"
mongodb-version: "4.2"
topology: "*"
compressor: 'zlib'
os: rhel70
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test"

-
matrix_name: "zlib-noauth"
matrix_spec:
auth-and-ssl: "noauth-and-nossl"
ruby: "ruby-1.9"
ruby: "ruby-2.3"
mongodb-version: "3.6"
topology: "*"
compressor: 'zlib'
os: rhel70
display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test"

-
matrix_name: "ruby-head"
matrix_spec: { auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"], ruby: ["ruby-head"], mongodb-version: "4.0", topology: "*" }
matrix_spec:
auth-and-ssl: ["auth-and-ssl", "noauth-and-nossl"]
ruby: ["ruby-head"]
mongodb-version: "4.0"
topology: "*"
os: ubuntu1604
display_name: "${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
run_on:
- ubuntu1604-test
tasks:
- name: "test"

Expand All @@ -895,9 +866,8 @@ buildvariants:
mongodb-version: '4.0'
topology: replica-set
as: as
os: rhel70
display_name: "AS ${mongodb-version} ${topology} ${ruby}"
run_on:
- rhel70-small
tasks:
- name: "test"

Expand All @@ -908,9 +878,8 @@ buildvariants:
ruby: ["ruby-2.5"]
mongodb-version: '3.6'
topology: replica-set
os: rhel70
display_name: "3.6 Replica Set with 3.4 FCV"
run_on:
- rhel70-small
tasks:
- name: "test"

Expand All @@ -920,9 +889,8 @@ buildvariants:
ruby: "*"
mongodb-version: ['4.0', '4.2']
topology: standalone
os: ubuntu1404
display_name: "Local TLS ${mongodb-version} ${ruby}"
run_on:
- ubuntu1404-test
tasks:
- name: "local-tls-tests"

Expand All @@ -942,21 +910,11 @@ buildvariants:
matrix_name: "enterprise-auth-tests-rhel"
matrix_spec:
auth-and-ssl: "auth-and-ssl"
ruby: ["ruby-1.9"]
display_name: "Enterprise Auth RHEL ${ruby}"
run_on:
- rhel70-small
ruby: ["ruby-2.3", "ruby-2.4", "ruby-2.5"]
os: rhel70
display_name: "Enterprise Auth ${ruby} ${os}"
tasks:
- name: "enterprise-auth-tests"

# Skipped due to segfaults: https://jira.mongodb.org/browse/RUBY-1534
#-
# matrix_name: "enterprise-auth-tests-debian"
# matrix_spec:
# auth-and-ssl: "auth-and-ssl"
# ruby: ["ruby-2.5"]
# display_name: "Enterprise Auth Debian ${ruby}"
# run_on:
# - debian81-test
# tasks:
# - name: "enterprise-auth-tests"
# Enterprise auth tests on debian are omitted due to segfaults:
# https://jira.mongodb.org/browse/RUBY-1534
4 changes: 2 additions & 2 deletions .evergreen/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ setup_ruby() {

#rvm reinstall $RVM_RUBY
else
if ! test "$RVM_RUBY" = ruby-1.9; then
if true; then

# For testing toolchains:
toolchain_url=https://s3.amazonaws.com//mciuploads/mongo-ruby-toolchain/`host_arch`/741a9eba5788e6d5254a09319d7d237b40a9f4d6/mongo_ruby_driver_toolchain_`host_arch`_patch_741a9eba5788e6d5254a09319d7d237b40a9f4d6_5cfa8ad0d6d80a02bbb45be7_19_06_07_16_03_30.tar.gz
Expand Down Expand Up @@ -132,7 +132,7 @@ EOH
# Only install bundler when not using ruby-head.
# ruby-head comes with bundler and gem complains
# because installing bundler would overwrite the bundler binary
if test "$RVM_RUBY" = ruby-1.9 || test "$RVM_RUBY" = ruby-2.2 || echo "$RVM_RUBY" |grep -q jruby; then
if echo "$RVM_RUBY" |grep -q jruby; then
gem install bundler -v '<2'
fi
fi
Expand Down
22 changes: 22 additions & 0 deletions .evergreen/validate
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/sh

# This script can be used to validate the contents of Evergreen configuration
# and shell scripts (as much as possible) locally, prior to starting patch
# and/or pull request builds. Invoke it with a relative or absolute path
# like so:
#
# ./.evergreen/validate

set -e

this_dir="$(dirname "$0")"

for yml in "$this_dir"/*.yml; do
echo "Validating $yml"
evergreen validate "$yml"
done

for sh in "$this_dir"/*.sh; do
echo "Validating $sh"
bash -n "$sh"
done
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Environment
We recommend using [rbenv](https://github.com/sstephenson/rbenv) to set up
the Ruby development and testing environments, though other tools like
[RVM](https://rvm.io/) will also work. The driver currently supports
MRI 1.9.3-2.6 and JRuby 9.1-9.2.
MRI 2.3-2.6 and JRuby 9.1-9.2.

A MongoDB cluster is required to run the tests. Setup procedures and
recommendations for various clusters, as well as how to configure the
Expand Down
Loading