Skip to content

Commit 953930d

Browse files
Fix serverless tests
1 parent 1661ff2 commit 953930d

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.evergreen/config.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1878,10 +1878,9 @@ buildvariants:
18781878
- matrix_name: "serverless"
18791879
matrix_spec:
18801880
# https://jira.mongodb.org/browse/RUBY-3217
1881-
# ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
1882-
ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7"]
1881+
ruby: ["3.1", "3.2"]
18831882
fle: path
1884-
os: rhel8
1883+
os: ubuntu2204
18851884
display_name: "Atlas serverless ${ruby}"
18861885
tasks:
18871886
- name: serverless_task_group

.evergreen/config/standard.yml.erb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
supported_rubies = supported_mri_rubies + jrubies
2727

28+
ubuntu2204_rubies = %w( 3.1 3.2 )
29+
2830
# The latest stable version of MongoDB
2931
latest_stable_mdb = "7.0".inspect # so it gets quoted as a string
3032

@@ -525,10 +527,9 @@ buildvariants:
525527
- matrix_name: "serverless"
526528
matrix_spec:
527529
# https://jira.mongodb.org/browse/RUBY-3217
528-
# ruby: <%= supported_rubies %>
529-
ruby: <%= supported_mri_rubies %>
530+
ruby: <%= ubuntu2204_rubies %>
530531
fle: path
531-
os: rhel8
532+
os: ubuntu2204
532533
display_name: "Atlas serverless ${ruby}"
533534
tasks:
534535
- name: serverless_task_group

.evergreen/run-tests-serverless.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ else
2525
python3 -u .evergreen/mongodl.py --component crypt_shared -V ${SERVERLESS_MONGODB_VERSION} --out `pwd`/csfle_lib --target `host_distro` || true
2626
if test -f `pwd`/csfle_lib/lib/mongo_crypt_v1.so
2727
then
28-
echo Usinn crypt shared library version ${SERVERLESS_MONGODB_VERSION}
28+
echo Using crypt shared library version ${SERVERLESS_MONGODB_VERSION}
2929
export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=`pwd`/csfle_lib/lib/mongo_crypt_v1.so
3030
else
3131
echo Failed to download crypt shared library
3232
exit -1
3333
fi
3434
fi
3535

36-
if ! ( test -f /etc/os-release & grep -q ^ID.*rhel /etc/os-release & grep -q ^VERSION_ID.*8.0 /etc/os-release ); then
37-
echo Serverless tests assume rhel80
36+
if ! ( test -f /etc/os-release & grep -q ^ID.*ubuntu /etc/os-release & grep -q ^VERSION_ID.*22.04 /etc/os-release ); then
37+
echo Serverless tests assume ubuntu2204
3838
echo If this has changed, update .evergreen/run-tests-serverless.sh as necessary
3939
exit -1
4040
fi
@@ -43,8 +43,8 @@ mkdir libmongocrypt
4343
cd libmongocrypt
4444
curl --retry 3 -fLo libmongocrypt-all.tar.gz "https://s3.amazonaws.com/mciuploads/libmongocrypt/all/master/latest/libmongocrypt-all.tar.gz"
4545
tar xf libmongocrypt-all.tar.gz
46-
# We assume that serverless tests always use rhel80
47-
export LIBMONGOCRYPT_PATH=`pwd`/rhel-80-64-bit/nocrypto/lib64/libmongocrypt.so
46+
# We assume that serverless tests always use ubuntu2204
47+
export LIBMONGOCRYPT_PATH=`pwd`/ubuntu2204-64/nocrypto/lib/libmongocrypt.so
4848
cd -
4949

5050
cd .evergreen/csfle

0 commit comments

Comments
 (0)