Skip to content

Commit 0002cf8

Browse files
authored
RUBY-3347 add additional serverless project to tests (#2810)
1 parent cc79991 commit 0002cf8

File tree

4 files changed

+40
-4
lines changed

4 files changed

+40
-4
lines changed

.evergreen/config.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,14 @@ functions:
123123
export ATLAS_SERVERLESS_URI="${atlas_serverless_uri}"
124124
export ATLAS_SERVERLESS_LB_URI="${atlas_serverless_lb_uri}"
125125
export RVM_RUBY="${RVM_RUBY}"
126-
export SERVERLESS_DRIVERS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
126+
127+
if [[ -n "${USE_PROXY_SERVERLESS}" ]];
128+
then
129+
export SERVERLESS_DRIVERS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}"
130+
else
131+
export SERVERLESS_DRIVERS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
132+
fi
133+
127134
export SERVERLESS_API_PUBLIC_KEY="${SERVERLESS_API_PUBLIC_KEY}"
128135
export SERVERLESS_API_PRIVATE_KEY="${SERVERLESS_API_PRIVATE_KEY}"
129136
export SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}"
@@ -1197,6 +1204,16 @@ axes:
11971204
- id: no
11981205
display_name: No
11991206

1207+
- id: serverless-project
1208+
display_name: serverless project
1209+
values:
1210+
- id: original
1211+
display_name: Original
1212+
- id: proxy
1213+
display_name: Proxy
1214+
variables:
1215+
USE_PROXY_SERVERLESS: 1
1216+
12001217
buildvariants:
12011218
- matrix_name: "auth/ssl"
12021219
matrix_spec:
@@ -1771,7 +1788,8 @@ buildvariants:
17711788
ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
17721789
fle: path
17731790
os: rhel8
1774-
display_name: "Atlas serverless ${ruby} single mongos"
1791+
serverless-project: [ original, proxy ]
1792+
display_name: "Atlas serverless ${ruby} ${serverless-project}"
17751793
tasks:
17761794
- name: test-serverless
17771795

.evergreen/config/axes.yml.erb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,3 +405,13 @@ axes:
405405
API_VERSION_REQUIRED: 1
406406
- id: no
407407
display_name: No
408+
409+
- id: serverless-project
410+
display_name: serverless project
411+
values:
412+
- id: original
413+
display_name: Original
414+
- id: proxy
415+
display_name: Proxy
416+
variables:
417+
USE_PROXY_SERVERLESS: 1

.evergreen/config/common.yml.erb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,14 @@ functions:
120120
export ATLAS_SERVERLESS_URI="${atlas_serverless_uri}"
121121
export ATLAS_SERVERLESS_LB_URI="${atlas_serverless_lb_uri}"
122122
export RVM_RUBY="${RVM_RUBY}"
123-
export SERVERLESS_DRIVERS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
123+
124+
if [[ -n "${USE_PROXY_SERVERLESS}" ]];
125+
then
126+
export SERVERLESS_DRIVERS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}"
127+
else
128+
export SERVERLESS_DRIVERS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
129+
fi
130+
124131
export SERVERLESS_API_PUBLIC_KEY="${SERVERLESS_API_PUBLIC_KEY}"
125132
export SERVERLESS_API_PRIVATE_KEY="${SERVERLESS_API_PRIVATE_KEY}"
126133
export SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}"

.evergreen/config/standard.yml.erb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,8 @@ buildvariants:
517517
ruby: <%= supported_mri_rubies %>
518518
fle: path
519519
os: rhel8
520-
display_name: "Atlas serverless ${ruby} single mongos"
520+
serverless-project: [ original, proxy ]
521+
display_name: "Atlas serverless ${ruby} ${serverless-project}"
521522
tasks:
522523
- name: test-serverless
523524

0 commit comments

Comments
 (0)