Skip to content

RUBY-3347 add additional serverless project to tests #2810

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 1 commit into from
Nov 21, 2023
Merged

RUBY-3347 add additional serverless project to tests #2810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 20 additions & 2 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,14 @@ functions:
export ATLAS_SERVERLESS_URI="${atlas_serverless_uri}"
export ATLAS_SERVERLESS_LB_URI="${atlas_serverless_lb_uri}"
export RVM_RUBY="${RVM_RUBY}"
export SERVERLESS_DRIVERS_GROUP="${SERVERLESS_DRIVERS_GROUP}"

if [[ -n "${USE_PROXY_SERVERLESS}" ]];
then
export SERVERLESS_DRIVERS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}"
else
export SERVERLESS_DRIVERS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
fi

export SERVERLESS_API_PUBLIC_KEY="${SERVERLESS_API_PUBLIC_KEY}"
export SERVERLESS_API_PRIVATE_KEY="${SERVERLESS_API_PRIVATE_KEY}"
export SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}"
Expand Down Expand Up @@ -1197,6 +1204,16 @@ axes:
- id: no
display_name: No

- id: serverless-project
display_name: serverless project
values:
- id: original
display_name: Original
- id: proxy
display_name: Proxy
variables:
USE_PROXY_SERVERLESS: 1

buildvariants:
- matrix_name: "auth/ssl"
matrix_spec:
Expand Down Expand Up @@ -1771,7 +1788,8 @@ buildvariants:
ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "ruby-2.6", "ruby-2.5"]
fle: path
os: rhel8
display_name: "Atlas serverless ${ruby} single mongos"
serverless-project: [ original, proxy ]
display_name: "Atlas serverless ${ruby} ${serverless-project}"
tasks:
- name: test-serverless

Expand Down
10 changes: 10 additions & 0 deletions .evergreen/config/axes.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,3 +405,13 @@ axes:
API_VERSION_REQUIRED: 1
- id: no
display_name: No

- id: serverless-project
display_name: serverless project
values:
- id: original
display_name: Original
- id: proxy
display_name: Proxy
variables:
USE_PROXY_SERVERLESS: 1
9 changes: 8 additions & 1 deletion .evergreen/config/common.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,14 @@ functions:
export ATLAS_SERVERLESS_URI="${atlas_serverless_uri}"
export ATLAS_SERVERLESS_LB_URI="${atlas_serverless_lb_uri}"
export RVM_RUBY="${RVM_RUBY}"
export SERVERLESS_DRIVERS_GROUP="${SERVERLESS_DRIVERS_GROUP}"

if [[ -n "${USE_PROXY_SERVERLESS}" ]];
then
export SERVERLESS_DRIVERS_GROUP="${PROXY_SERVERLESS_DRIVERS_GROUP}"
else
export SERVERLESS_DRIVERS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
fi

export SERVERLESS_API_PUBLIC_KEY="${SERVERLESS_API_PUBLIC_KEY}"
export SERVERLESS_API_PRIVATE_KEY="${SERVERLESS_API_PRIVATE_KEY}"
export SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}"
Expand Down
3 changes: 2 additions & 1 deletion .evergreen/config/standard.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,8 @@ buildvariants:
ruby: <%= supported_mri_rubies %>
fle: path
os: rhel8
display_name: "Atlas serverless ${ruby} single mongos"
serverless-project: [ original, proxy ]
display_name: "Atlas serverless ${ruby} ${serverless-project}"
tasks:
- name: test-serverless

Expand Down