Skip to content
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

RUBY-3414 Re-enable serverless #2885

Merged
merged 2 commits into from
Jul 11, 2024
Merged

RUBY-3414 Re-enable serverless #2885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d811c4
Re-enable serverless
comandeo-mongo Jul 8, 2024
c40e625
Remove serverless-next
comandeo-mongo Jul 10, 2024
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
62 changes: 10 additions & 52 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,36 +496,6 @@ task_groups:
tasks:
- "test-serverless"

- name: serverless_next_task_group
setup_group_can_fail_task: true
setup_group_timeout_secs: 1800 # 30 minutes
setup_group:
- func: "fetch source"
- func: "create expansions"
- command: ec2.assume_role
params:
role_arn: ${aws_test_secrets_role}
- command: shell.exec
params:
shell: "bash"
script: |
${PREPARE_SHELL}
bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh serverless_next
bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
- command: expansions.update
params:
file: serverless-expansion.yml
teardown_task:
- command: shell.exec
params:
script: |
${PREPARE_SHELL}
bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh serverless_next
bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
- func: "upload test results"
tasks:
- "test-serverless"

- name: testatlas_task_group
setup_group_can_fail_task: true
setup_group_timeout_secs: 1800 # 30 minutes
Expand Down Expand Up @@ -1868,28 +1838,16 @@ buildvariants:
tasks:
- name: testatlas_task_group

# Commented out, pending RUBY-3414
# - matrix_name: "serverless"
# matrix_spec:
# # https://jira.mongodb.org/browse/RUBY-3217
# # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
# ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7"]
# fle: path
# os: rhel8
# display_name: "Atlas serverless ${ruby}"
# tasks:
# - name: serverless_task_group
#
# - matrix_name: "serverless-next"
# matrix_spec:
# # https://jira.mongodb.org/browse/RUBY-3217
# # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
# ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7"]
# fle: path
# os: rhel8
# display_name: "Atlas serverless-next ${ruby}"
# tasks:
# - name: serverless_next_task_group
- matrix_name: "serverless"
matrix_spec:
# https://jira.mongodb.org/browse/RUBY-3217
# ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7"]
fle: path
os: rhel8
display_name: "Atlas serverless ${ruby}"
tasks:
- name: serverless_task_group

- matrix_name: "aws-lambda"
matrix_spec:
Expand Down
30 changes: 0 additions & 30 deletions .evergreen/config/common.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,36 +493,6 @@ task_groups:
tasks:
- "test-serverless"

- name: serverless_next_task_group
setup_group_can_fail_task: true
setup_group_timeout_secs: 1800 # 30 minutes
setup_group:
- func: "fetch source"
- func: "create expansions"
- command: ec2.assume_role
params:
role_arn: ${aws_test_secrets_role}
- command: shell.exec
params:
shell: "bash"
script: |
${PREPARE_SHELL}
bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh serverless_next
bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
- command: expansions.update
params:
file: serverless-expansion.yml
teardown_task:
- command: shell.exec
params:
script: |
${PREPARE_SHELL}
bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh serverless_next
bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
- func: "upload test results"
tasks:
- "test-serverless"

- name: testatlas_task_group
setup_group_can_fail_task: true
setup_group_timeout_secs: 1800 # 30 minutes
Expand Down
32 changes: 10 additions & 22 deletions .evergreen/config/standard.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,28 +510,16 @@ buildvariants:
tasks:
- name: testatlas_task_group

# Commented out, pending RUBY-3414
# - matrix_name: "serverless"
# matrix_spec:
# # https://jira.mongodb.org/browse/RUBY-3217
# # ruby: <%= supported_rubies %>
# ruby: <%= supported_mri_rubies %>
# fle: path
# os: rhel8
# display_name: "Atlas serverless ${ruby}"
# tasks:
# - name: serverless_task_group
#
# - matrix_name: "serverless-next"
# matrix_spec:
# # https://jira.mongodb.org/browse/RUBY-3217
# # ruby: <%= supported_rubies %>
# ruby: <%= supported_mri_rubies %>
# fle: path
# os: rhel8
# display_name: "Atlas serverless-next ${ruby}"
# tasks:
# - name: serverless_next_task_group
- matrix_name: "serverless"
matrix_spec:
# https://jira.mongodb.org/browse/RUBY-3217
# ruby: <%= supported_rubies %>
ruby: <%= supported_mri_rubies %>
fle: path
os: rhel8
display_name: "Atlas serverless ${ruby}"
tasks:
- name: serverless_task_group

- matrix_name: "aws-lambda"
matrix_spec:
Expand Down
2 changes: 2 additions & 0 deletions .evergreen/run-tests-serverless.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ set_env_vars
set_env_python
set_env_ruby

source ${DRIVERS_TOOLS}/.evergreen/serverless/secrets-export.sh

bundle_install

export MONGODB_URI=`echo ${SERVERLESS_URI} | sed -r 's/mongodb\+srv:\/\//mongodb\+srv:\/\/'"${SERVERLESS_ATLAS_USER}"':'"${SERVERLESS_ATLAS_PASSWORD}@"'/g'`
Expand Down
Loading