Skip to content

RUBY-2832 Fix FLE on jruby-9.2 configuration in Evergreen #2407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 17, 2022
Merged

RUBY-2832 Fix FLE on jruby-9.2 configuration in Evergreen #2407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f140b2d
2832
p Jan 24, 2022
a93d19d
install dotenv
p Jan 25, 2022
21adc13
install as user
p Jan 27, 2022
06e0b35
try SocketError
p Jan 27, 2022
9f523a3
remove comment
p Jan 27, 2022
d5e56a8
update toolchain used in docker
p Jan 31, 2022
d6d275b
test on jruby 9.3 also
p Jan 31, 2022
d946826
try referencing constants via global Socket class for jruby
p Jan 31, 2022
d0fcc36
2832
p Feb 4, 2022
92be6cb
update toolchain ref
p Feb 15, 2022
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
15 changes: 13 additions & 2 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1303,8 +1303,6 @@ buildvariants:
- matrix_name: "fle-4.4"
matrix_spec:
auth-and-ssl: "noauth-and-nossl"
# https://jira.mongodb.org/browse/RUBY-2832
# ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
ruby: [ruby-3.1, ruby-3.0, ruby-2.7]
topology: standalone
mongodb-version: ['4.4']
Expand Down Expand Up @@ -1338,6 +1336,19 @@ buildvariants:
tasks:
- name: "test-fle"

- matrix_name: "fle-jruby"
matrix_spec:
auth-and-ssl: "noauth-and-nossl"
ruby: [jruby-9.2, jruby-9.3]
topology: standalone
mongodb-version: ['5.0']
os: ubuntu1804
fle: fle
docker-distro: ubuntu1804
display_name: "FLE: ${mongodb-version} ${ruby}"
tasks:
- name: "test-fle-via-docker"

- matrix_name: aws-auth-regular
matrix_spec:
auth-and-ssl: aws-regular
Expand Down
15 changes: 13 additions & 2 deletions .evergreen/config/standard.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,6 @@ buildvariants:
- matrix_name: "fle-4.4"
matrix_spec:
auth-and-ssl: "noauth-and-nossl"
# https://jira.mongodb.org/browse/RUBY-2832
# ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
ruby: [ruby-3.1, ruby-3.0, ruby-2.7]
topology: standalone
mongodb-version: ['4.4']
Expand Down Expand Up @@ -472,6 +470,19 @@ buildvariants:
tasks:
- name: "test-fle"

- matrix_name: "fle-jruby"
matrix_spec:
auth-and-ssl: "noauth-and-nossl"
ruby: [jruby-9.2, jruby-9.3]
topology: standalone
mongodb-version: ['5.0']
os: ubuntu1804
fle: fle
docker-distro: ubuntu1804
display_name: "FLE: ${mongodb-version} ${ruby}"
tasks:
- name: "test-fle-via-docker"

- matrix_name: aws-auth-regular
matrix_spec:
auth-and-ssl: aws-regular
Expand Down
1 change: 1 addition & 0 deletions .evergreen/run-tests-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ done

if test -f .env.private; then
params="$params -a .env.private"
gem install dotenv || gem install --user dotenv
fi

# OCSP verifier tests need debian10 so that ocsp mock works
Expand Down
2 changes: 1 addition & 1 deletion spec/integration/client_side_encryption/custom_endpoint_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@

let(:error_regex) do
if BSON::Environment.jruby?
/Bad file descriptor/
/SocketError/
else
/Connection refused/
end
Expand Down
2 changes: 1 addition & 1 deletion spec/shared
Open in desktop
Submodule shared updated 3 files
+1 −1 lib/mrss/docker_runner.rb
+8 −4 share/Dockerfile.erb
+2 −1 shlib/set_env.sh