Skip to content

Commit 2b40aac

Browse files
p-mongop
andauthored
RUBY-2832 Fix FLE on jruby-9.2 configuration in Evergreen (#2407)
* 2832 * install dotenv * install as user * try SocketError * remove comment * update toolchain used in docker * test on jruby 9.3 also * try referencing constants via global Socket class for jruby * 2832 * update toolchain ref Co-authored-by: Oleg Pudeyev <[email protected]>
1 parent 3c675ea commit 2b40aac

File tree

5 files changed

+29
-6
lines changed

5 files changed

+29
-6
lines changed

.evergreen/config.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,8 +1303,6 @@ buildvariants:
13031303
- matrix_name: "fle-4.4"
13041304
matrix_spec:
13051305
auth-and-ssl: "noauth-and-nossl"
1306-
# https://jira.mongodb.org/browse/RUBY-2832
1307-
# ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
13081306
ruby: [ruby-3.1, ruby-3.0, ruby-2.7]
13091307
topology: standalone
13101308
mongodb-version: ['4.4']
@@ -1338,6 +1336,19 @@ buildvariants:
13381336
tasks:
13391337
- name: "test-fle"
13401338

1339+
- matrix_name: "fle-jruby"
1340+
matrix_spec:
1341+
auth-and-ssl: "noauth-and-nossl"
1342+
ruby: [jruby-9.2, jruby-9.3]
1343+
topology: standalone
1344+
mongodb-version: ['5.0']
1345+
os: ubuntu1804
1346+
fle: fle
1347+
docker-distro: ubuntu1804
1348+
display_name: "FLE: ${mongodb-version} ${ruby}"
1349+
tasks:
1350+
- name: "test-fle-via-docker"
1351+
13411352
- matrix_name: aws-auth-regular
13421353
matrix_spec:
13431354
auth-and-ssl: aws-regular

.evergreen/config/standard.yml.erb

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,6 @@ buildvariants:
437437
- matrix_name: "fle-4.4"
438438
matrix_spec:
439439
auth-and-ssl: "noauth-and-nossl"
440-
# https://jira.mongodb.org/browse/RUBY-2832
441-
# ruby: [ruby-3.0, ruby-2.7, jruby-9.2]
442440
ruby: [ruby-3.1, ruby-3.0, ruby-2.7]
443441
topology: standalone
444442
mongodb-version: ['4.4']
@@ -472,6 +470,19 @@ buildvariants:
472470
tasks:
473471
- name: "test-fle"
474472

473+
- matrix_name: "fle-jruby"
474+
matrix_spec:
475+
auth-and-ssl: "noauth-and-nossl"
476+
ruby: [jruby-9.2, jruby-9.3]
477+
topology: standalone
478+
mongodb-version: ['5.0']
479+
os: ubuntu1804
480+
fle: fle
481+
docker-distro: ubuntu1804
482+
display_name: "FLE: ${mongodb-version} ${ruby}"
483+
tasks:
484+
- name: "test-fle-via-docker"
485+
475486
- matrix_name: aws-auth-regular
476487
matrix_spec:
477488
auth-and-ssl: aws-regular

.evergreen/run-tests-docker.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ done
2323

2424
if test -f .env.private; then
2525
params="$params -a .env.private"
26+
gem install dotenv || gem install --user dotenv
2627
fi
2728

2829
# OCSP verifier tests need debian10 so that ocsp mock works

spec/integration/client_side_encryption/custom_endpoint_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595

9696
let(:error_regex) do
9797
if BSON::Environment.jruby?
98-
/Bad file descriptor/
98+
/SocketError/
9999
else
100100
/Connection refused/
101101
end

0 commit comments

Comments
 (0)