diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 7db7bc4ea7..dab8d51fb6 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -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 @@ -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: diff --git a/.evergreen/config/common.yml.erb b/.evergreen/config/common.yml.erb index cacba6b5aa..ca749c3d66 100644 --- a/.evergreen/config/common.yml.erb +++ b/.evergreen/config/common.yml.erb @@ -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 diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb index 668e65a9b1..77c404f51a 100644 --- a/.evergreen/config/standard.yml.erb +++ b/.evergreen/config/standard.yml.erb @@ -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: diff --git a/.evergreen/run-tests-serverless.sh b/.evergreen/run-tests-serverless.sh index cd71e41d6e..c34c1f5d94 100755 --- a/.evergreen/run-tests-serverless.sh +++ b/.evergreen/run-tests-serverless.sh @@ -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'`