Skip to content

Commit 765126d

Browse files
jamisjamis
committed
RUBY-3652 Remove serverless testing
1 parent 7d0f906 commit 765126d

File tree

6 files changed

+56
-266
lines changed

6 files changed

+56
-266
lines changed

‎.evergreen/config.yml

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,7 @@ functions:
120120
export ATLAS_FREE_TIER_URI="${atlas_free_tier_uri}"
121121
export ATLAS_TLS11_URI="${atlas_tls11_uri}"
122122
export ATLAS_TLS12_URI="${atlas_tls12_uri}"
123-
export ATLAS_SERVERLESS_URI="${atlas_serverless_uri}"
124-
export ATLAS_SERVERLESS_LB_URI="${atlas_serverless_lb_uri}"
125123
export RVM_RUBY="${RVM_RUBY}"
126-
127-
export SERVERLESS_DRIVERS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
128-
export SERVERLESS_API_PUBLIC_KEY="${SERVERLESS_API_PUBLIC_KEY}"
129-
export SERVERLESS_API_PRIVATE_KEY="${SERVERLESS_API_PRIVATE_KEY}"
130-
export SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}"
131-
export SERVERLESS_ATLAS_PASSWORD="${SERVERLESS_ATLAS_PASSWORD}"
132124
EOT
133125
134126
# See what we've done
@@ -360,17 +352,6 @@ functions:
360352
script: |
361353
rm -f .env.private
362354
363-
"build and test docker image":
364-
- command: shell.exec
365-
type: test
366-
params:
367-
shell: bash
368-
working_dir: "src"
369-
script: |
370-
${PREPARE_SHELL}
371-
set -x
372-
.evergreen/test-on-docker -d ${os} MONGODB_VERSION=${mongodb-version} TOPOLOGY=${topology} RVM_RUBY=${ruby} -s .evergreen/run-tests.sh TEST_CMD=true ${PRELOAD_ARG}
373-
374355
"run benchmarks":
375356
- command: shell.exec
376357
type: test
@@ -401,23 +382,6 @@ functions:
401382
fi
402383
.evergreen/run-tests.sh
403384
404-
"run tests via docker":
405-
- command: shell.exec
406-
type: test
407-
params:
408-
shell: bash
409-
working_dir: "src"
410-
script: |
411-
${PREPARE_SHELL}
412-
# Needed for generating temporary aws credentials.
413-
if [ -n "${FLE}" ];
414-
then
415-
export AWS_ACCESS_KEY_ID="${fle_aws_key}"
416-
export AWS_SECRET_ACCESS_KEY="${fle_aws_secret}"
417-
export AWS_DEFAULT_REGION="${fle_aws_region}"
418-
fi
419-
.evergreen/run-tests-docker.sh
420-
421385
"run AWS auth tests":
422386
- command: shell.exec
423387
type: test
@@ -438,16 +402,6 @@ functions:
438402
${PREPARE_SHELL}
439403
.evergreen/run-tests-kerberos-unit.sh
440404
441-
"run Kerberos integration tests":
442-
- command: shell.exec
443-
type: test
444-
params:
445-
shell: bash
446-
working_dir: "src"
447-
script: |
448-
${PREPARE_SHELL}
449-
.evergreen/run-tests-kerberos-integration.sh
450-
451405
"run Atlas tests":
452406
- command: shell.exec
453407
type: test
@@ -458,24 +412,6 @@ functions:
458412
${PREPARE_SHELL}
459413
MONGODB_URI="${MONGODB_URI}" .evergreen/run-tests-atlas.sh
460414
461-
"run serverless tests":
462-
- command: shell.exec
463-
type: test
464-
params:
465-
shell: bash
466-
working_dir: "src"
467-
script: |
468-
${PREPARE_SHELL}
469-
# Needed for generating temporary aws credentials.
470-
if [ -n "${FLE}" ];
471-
then
472-
export AWS_ACCESS_KEY_ID="${fle_aws_key}"
473-
export AWS_SECRET_ACCESS_KEY="${fle_aws_secret}"
474-
export AWS_DEFAULT_REGION="${fle_aws_region}"
475-
fi
476-
477-
CRYPT_SHARED_LIB_PATH="${CRYPT_SHARED_LIB_PATH}" SERVERLESS=1 SSL=ssl RVM_RUBY="${RVM_RUBY}" SINGLE_MONGOS="${SINGLE_MONGOS}" SERVERLESS_URI="${SERVERLESS_URI}" FLE="${FLE}" SERVERLESS_MONGODB_VERSION="${SERVERLESS_MONGODB_VERSION}" .evergreen/run-tests-serverless.sh
478-
479415
pre:
480416
- func: "fetch source"
481417
- func: "create expansions"
@@ -489,35 +425,6 @@ post:
489425
- func: "upload test results to s3"
490426

491427
task_groups:
492-
- name: serverless_task_group
493-
setup_group_can_fail_task: true
494-
setup_group_timeout_secs: 1800 # 30 minutes
495-
setup_group:
496-
- func: "fetch source"
497-
- func: "create expansions"
498-
- command: ec2.assume_role
499-
params:
500-
role_arn: ${aws_test_secrets_role}
501-
- command: shell.exec
502-
params:
503-
shell: "bash"
504-
script: |
505-
${PREPARE_SHELL}
506-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh
507-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
508-
- command: expansions.update
509-
params:
510-
file: serverless-expansion.yml
511-
teardown_task:
512-
- command: shell.exec
513-
params:
514-
script: |
515-
${PREPARE_SHELL}
516-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
517-
- func: "upload test results"
518-
tasks:
519-
- "test-serverless"
520-
521428
- name: testatlas_task_group
522429
setup_group_can_fail_task: true
523430
setup_group_timeout_secs: 1800 # 30 minutes
@@ -753,26 +660,12 @@ tasks:
753660
- name: "test-atlas"
754661
commands:
755662
- func: "run Atlas tests"
756-
- name: "test-serverless"
757-
commands:
758-
- func: "export FLE credentials"
759-
- func: "run serverless tests"
760-
- name: "test-docker"
761-
commands:
762-
- func: "build and test docker image"
763663
- name: "test-mlaunch"
764664
commands:
765665
- func: "run tests"
766666
- name: "driver-bench"
767667
commands:
768668
- func: "run benchmarks"
769-
- name: "test-via-docker"
770-
commands:
771-
- func: "run tests via docker"
772-
- name: "test-kerberos-integration"
773-
commands:
774-
- func: "export Kerberos credentials"
775-
- func: "run Kerberos integration tests"
776669
- name: "test-kerberos"
777670
commands:
778671
- func: "run Kerberos unit tests"
@@ -783,10 +676,6 @@ tasks:
783676
commands:
784677
- func: "export FLE credentials"
785678
- func: "run tests"
786-
- name: "test-fle-via-docker"
787-
commands:
788-
- func: "export FLE credentials"
789-
- func: "run tests via docker"
790679
- name: "test-aws-auth"
791680
commands:
792681
- func: "export AWS auth credentials"

‎.evergreen/config/common.yml.erb

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,7 @@ functions:
117117
export ATLAS_FREE_TIER_URI="${atlas_free_tier_uri}"
118118
export ATLAS_TLS11_URI="${atlas_tls11_uri}"
119119
export ATLAS_TLS12_URI="${atlas_tls12_uri}"
120-
export ATLAS_SERVERLESS_URI="${atlas_serverless_uri}"
121-
export ATLAS_SERVERLESS_LB_URI="${atlas_serverless_lb_uri}"
122120
export RVM_RUBY="${RVM_RUBY}"
123-
124-
export SERVERLESS_DRIVERS_GROUP="${SERVERLESS_DRIVERS_GROUP}"
125-
export SERVERLESS_API_PUBLIC_KEY="${SERVERLESS_API_PUBLIC_KEY}"
126-
export SERVERLESS_API_PRIVATE_KEY="${SERVERLESS_API_PRIVATE_KEY}"
127-
export SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}"
128-
export SERVERLESS_ATLAS_PASSWORD="${SERVERLESS_ATLAS_PASSWORD}"
129121
EOT
130122

131123
# See what we've done
@@ -357,17 +349,6 @@ functions:
357349
script: |
358350
rm -f .env.private
359351

360-
"build and test docker image":
361-
- command: shell.exec
362-
type: test
363-
params:
364-
shell: bash
365-
working_dir: "src"
366-
script: |
367-
${PREPARE_SHELL}
368-
set -x
369-
.evergreen/test-on-docker -d ${os} MONGODB_VERSION=${mongodb-version} TOPOLOGY=${topology} RVM_RUBY=${ruby} -s .evergreen/run-tests.sh TEST_CMD=true ${PRELOAD_ARG}
370-
371352
"run benchmarks":
372353
- command: shell.exec
373354
type: test
@@ -398,23 +379,6 @@ functions:
398379
fi
399380
.evergreen/run-tests.sh
400381

401-
"run tests via docker":
402-
- command: shell.exec
403-
type: test
404-
params:
405-
shell: bash
406-
working_dir: "src"
407-
script: |
408-
${PREPARE_SHELL}
409-
# Needed for generating temporary aws credentials.
410-
if [ -n "${FLE}" ];
411-
then
412-
export AWS_ACCESS_KEY_ID="${fle_aws_key}"
413-
export AWS_SECRET_ACCESS_KEY="${fle_aws_secret}"
414-
export AWS_DEFAULT_REGION="${fle_aws_region}"
415-
fi
416-
.evergreen/run-tests-docker.sh
417-
418382
"run AWS auth tests":
419383
- command: shell.exec
420384
type: test
@@ -435,16 +399,6 @@ functions:
435399
${PREPARE_SHELL}
436400
.evergreen/run-tests-kerberos-unit.sh
437401

438-
"run Kerberos integration tests":
439-
- command: shell.exec
440-
type: test
441-
params:
442-
shell: bash
443-
working_dir: "src"
444-
script: |
445-
${PREPARE_SHELL}
446-
.evergreen/run-tests-kerberos-integration.sh
447-
448402
"run Atlas tests":
449403
- command: shell.exec
450404
type: test
@@ -455,24 +409,6 @@ functions:
455409
${PREPARE_SHELL}
456410
MONGODB_URI="${MONGODB_URI}" .evergreen/run-tests-atlas.sh
457411

458-
"run serverless tests":
459-
- command: shell.exec
460-
type: test
461-
params:
462-
shell: bash
463-
working_dir: "src"
464-
script: |
465-
${PREPARE_SHELL}
466-
# Needed for generating temporary aws credentials.
467-
if [ -n "${FLE}" ];
468-
then
469-
export AWS_ACCESS_KEY_ID="${fle_aws_key}"
470-
export AWS_SECRET_ACCESS_KEY="${fle_aws_secret}"
471-
export AWS_DEFAULT_REGION="${fle_aws_region}"
472-
fi
473-
474-
CRYPT_SHARED_LIB_PATH="${CRYPT_SHARED_LIB_PATH}" SERVERLESS=1 SSL=ssl RVM_RUBY="${RVM_RUBY}" SINGLE_MONGOS="${SINGLE_MONGOS}" SERVERLESS_URI="${SERVERLESS_URI}" FLE="${FLE}" SERVERLESS_MONGODB_VERSION="${SERVERLESS_MONGODB_VERSION}" .evergreen/run-tests-serverless.sh
475-
476412
pre:
477413
- func: "fetch source"
478414
- func: "create expansions"
@@ -486,35 +422,6 @@ post:
486422
- func: "upload test results to s3"
487423

488424
task_groups:
489-
- name: serverless_task_group
490-
setup_group_can_fail_task: true
491-
setup_group_timeout_secs: 1800 # 30 minutes
492-
setup_group:
493-
- func: "fetch source"
494-
- func: "create expansions"
495-
- command: ec2.assume_role
496-
params:
497-
role_arn: ${aws_test_secrets_role}
498-
- command: shell.exec
499-
params:
500-
shell: "bash"
501-
script: |
502-
${PREPARE_SHELL}
503-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh
504-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
505-
- command: expansions.update
506-
params:
507-
file: serverless-expansion.yml
508-
teardown_task:
509-
- command: shell.exec
510-
params:
511-
script: |
512-
${PREPARE_SHELL}
513-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
514-
- func: "upload test results"
515-
tasks:
516-
- "test-serverless"
517-
518425
- name: testatlas_task_group
519426
setup_group_can_fail_task: true
520427
setup_group_timeout_secs: 1800 # 30 minutes
@@ -750,26 +657,12 @@ tasks:
750657
- name: "test-atlas"
751658
commands:
752659
- func: "run Atlas tests"
753-
- name: "test-serverless"
754-
commands:
755-
- func: "export FLE credentials"
756-
- func: "run serverless tests"
757-
- name: "test-docker"
758-
commands:
759-
- func: "build and test docker image"
760660
- name: "test-mlaunch"
761661
commands:
762662
- func: "run tests"
763663
- name: "driver-bench"
764664
commands:
765665
- func: "run benchmarks"
766-
- name: "test-via-docker"
767-
commands:
768-
- func: "run tests via docker"
769-
- name: "test-kerberos-integration"
770-
commands:
771-
- func: "export Kerberos credentials"
772-
- func: "run Kerberos integration tests"
773666
- name: "test-kerberos"
774667
commands:
775668
- func: "run Kerberos unit tests"
@@ -780,10 +673,6 @@ tasks:
780673
commands:
781674
- func: "export FLE credentials"
782675
- func: "run tests"
783-
- name: "test-fle-via-docker"
784-
commands:
785-
- func: "export FLE credentials"
786-
- func: "run tests via docker"
787676
- name: "test-aws-auth"
788677
commands:
789678
- func: "export AWS auth credentials"

‎spec/runners/crud.rb

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,14 +224,12 @@ def define_spec_tests_with_requirements(spec, &block)
224224
if req.topologies
225225
require_topology *req.topologies
226226
end
227-
if SpecConfig.instance.serverless? && req.serverless == :forbid
228-
before(:all) do
229-
skip "Serverless forbidden"
230-
end
231-
end
232-
if !SpecConfig.instance.serverless? && req.serverless == :require
227+
228+
# Once `serverless: require` is no longer present in any specs,
229+
# this can be removed.
230+
if req.serverless == :require
233231
before(:all) do
234-
skip "Serverless required"
232+
skip 'Serverless tests are no longer enabled, per RUBY-3652'
235233
end
236234
end
237235

0 commit comments

Comments
 (0)