Skip to content

Commit b3d4fcc

Browse files
comandeo-mongocomandeo-mongo
committed
Revert some changes in evg setup
1 parent 587d507 commit b3d4fcc

File tree

4 files changed

+120
-10
lines changed

4 files changed

+120
-10
lines changed

Diff for: ‎.evergreen/config.yml

+60-4
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,51 @@ task_groups:
516516
$DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
517517
tasks:
518518
- test-full-atlas-task
519+
520+
- name: test_aws_lambda_task_group
521+
setup_group_can_fail_task: true
522+
setup_group_timeout_secs: 1800 # 30 minutes
523+
setup_group:
524+
- func: fetch source
525+
- func: create expansions
526+
- command: shell.exec
527+
params:
528+
shell: "bash"
529+
working_dir: "src"
530+
script: |
531+
${PREPARE_SHELL}
532+
533+
echo "Setting up Atlas cluster"
534+
535+
DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
536+
DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
537+
DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
538+
DRIVERS_ATLAS_LAMBDA_USER="${DRIVERS_ATLAS_LAMBDA_USER}" \
539+
DRIVERS_ATLAS_LAMBDA_PASSWORD="${DRIVERS_ATLAS_LAMBDA_PASSWORD}" \
540+
LAMBDA_STACK_NAME="dbx-ruby-lambda" \
541+
MONGODB_VERSION="7.0" \
542+
task_id="${task_id}" \
543+
execution="${execution}" \
544+
$DRIVERS_TOOLS/.evergreen/atlas/setup-atlas-cluster.sh
545+
- command: expansions.update
546+
params:
547+
file: src/atlas-expansion.yml
548+
teardown_group:
549+
- command: shell.exec
550+
params:
551+
shell: "bash"
552+
working_dir: "src"
553+
script: |
554+
${PREPARE_SHELL}
555+
556+
DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
557+
DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
558+
DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
559+
LAMBDA_STACK_NAME="dbx-ruby-lambda" \
560+
task_id="${task_id}" \
561+
execution="${execution}" \
562+
$DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
563+
tasks:
519564
- test-aws-lambda-deployed
520565

521566
- name: testgcpkms_task_group
@@ -719,12 +764,14 @@ tasks:
719764
params:
720765
working_dir: "src"
721766
shell: "bash"
722-
add_expansions_to_env: true
723767
script: |
724768
${PREPARE_SHELL}
725-
MONGODB_URI="${MONGODB_URI}" .evergreen/run-tests-deployed-lambda.sh
769+
export MONGODB_URI=${MONGODB_URI}
770+
.evergreen/run-tests-deployed-lambda.sh
726771
env:
772+
TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/spec/faas/ruby-sam-app
727773
AWS_REGION: us-east-1
774+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
728775
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
729776
DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY}
730777
DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY}
@@ -736,6 +783,7 @@ tasks:
736783
AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
737784
LAMBDA_STACK_NAME: "dbx-ruby-lambda"
738785
RVM_RUBY: ruby-3.2
786+
MONGODB_URI: ${MONGODB_URI}
739787
axes:
740788

741789
- id: preload
@@ -1697,10 +1745,10 @@ buildvariants:
16971745
- name: testazurekms_task_group
16981746
batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
16991747

1700-
- matrix_name: atlas-full-and-lambda
1748+
- matrix_name: atlas-full
17011749
matrix_spec:
17021750
ruby: "ruby-3.2"
1703-
os: ubuntu2204
1751+
os: rhel8
17041752
display_name: "Atlas (Full)"
17051753
tasks:
17061754
- name: testatlas_task_group
@@ -1723,3 +1771,11 @@ buildvariants:
17231771
display_name: "Atlas serverless ${ruby} single mongos"
17241772
tasks:
17251773
- name: test-serverless
1774+
1775+
- matrix_name: "aws-lambda"
1776+
matrix_spec:
1777+
ruby: "ruby-3.2"
1778+
os: ubuntu2204
1779+
display_name: "AWS Lambda"
1780+
tasks:
1781+
- name: test_aws_lambda_task_group

Diff for: ‎.evergreen/config/common.yml.erb

+50-2
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,51 @@ task_groups:
513513
$DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
514514
tasks:
515515
- test-full-atlas-task
516+
517+
- name: test_aws_lambda_task_group
518+
setup_group_can_fail_task: true
519+
setup_group_timeout_secs: 1800 # 30 minutes
520+
setup_group:
521+
- func: fetch source
522+
- func: create expansions
523+
- command: shell.exec
524+
params:
525+
shell: "bash"
526+
working_dir: "src"
527+
script: |
528+
${PREPARE_SHELL}
529+
530+
echo "Setting up Atlas cluster"
531+
532+
DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
533+
DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
534+
DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
535+
DRIVERS_ATLAS_LAMBDA_USER="${DRIVERS_ATLAS_LAMBDA_USER}" \
536+
DRIVERS_ATLAS_LAMBDA_PASSWORD="${DRIVERS_ATLAS_LAMBDA_PASSWORD}" \
537+
LAMBDA_STACK_NAME="dbx-ruby-lambda" \
538+
MONGODB_VERSION="7.0" \
539+
task_id="${task_id}" \
540+
execution="${execution}" \
541+
$DRIVERS_TOOLS/.evergreen/atlas/setup-atlas-cluster.sh
542+
- command: expansions.update
543+
params:
544+
file: src/atlas-expansion.yml
545+
teardown_group:
546+
- command: shell.exec
547+
params:
548+
shell: "bash"
549+
working_dir: "src"
550+
script: |
551+
${PREPARE_SHELL}
552+
553+
DRIVERS_ATLAS_PUBLIC_API_KEY="${DRIVERS_ATLAS_PUBLIC_API_KEY}" \
554+
DRIVERS_ATLAS_PRIVATE_API_KEY="${DRIVERS_ATLAS_PRIVATE_API_KEY}" \
555+
DRIVERS_ATLAS_GROUP_ID="${DRIVERS_ATLAS_GROUP_ID}" \
556+
LAMBDA_STACK_NAME="dbx-ruby-lambda" \
557+
task_id="${task_id}" \
558+
execution="${execution}" \
559+
$DRIVERS_TOOLS/.evergreen/atlas/teardown-atlas-cluster.sh
560+
tasks:
516561
- test-aws-lambda-deployed
517562

518563
- name: testgcpkms_task_group
@@ -716,12 +761,14 @@ tasks:
716761
params:
717762
working_dir: "src"
718763
shell: "bash"
719-
add_expansions_to_env: true
720764
script: |
721765
${PREPARE_SHELL}
722-
MONGODB_URI="${MONGODB_URI}" .evergreen/run-tests-deployed-lambda.sh
766+
export MONGODB_URI=${MONGODB_URI}
767+
.evergreen/run-tests-deployed-lambda.sh
723768
env:
769+
TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/spec/faas/ruby-sam-app
724770
AWS_REGION: us-east-1
771+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
725772
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
726773
DRIVERS_ATLAS_PUBLIC_API_KEY: ${DRIVERS_ATLAS_PUBLIC_API_KEY}
727774
DRIVERS_ATLAS_PRIVATE_API_KEY: ${DRIVERS_ATLAS_PRIVATE_API_KEY}
@@ -733,3 +780,4 @@ tasks:
733780
AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
734781
LAMBDA_STACK_NAME: "dbx-ruby-lambda"
735782
RVM_RUBY: ruby-3.2
783+
MONGODB_URI: ${MONGODB_URI}

Diff for: ‎.evergreen/config/standard.yml.erb

+10-2
Original file line numberDiff line numberDiff line change
@@ -494,10 +494,10 @@ buildvariants:
494494
- name: testazurekms_task_group
495495
batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
496496

497-
- matrix_name: atlas-full-and-lambda
497+
- matrix_name: atlas-full
498498
matrix_spec:
499499
ruby: <%= latest_ruby %>
500-
os: ubuntu2204
500+
os: rhel8
501501
display_name: "Atlas (Full)"
502502
tasks:
503503
- name: testatlas_task_group
@@ -520,3 +520,11 @@ buildvariants:
520520
display_name: "Atlas serverless ${ruby} single mongos"
521521
tasks:
522522
- name: test-serverless
523+
524+
- matrix_name: "aws-lambda"
525+
matrix_spec:
526+
ruby: <%= latest_ruby %>
527+
os: ubuntu2204
528+
display_name: "AWS Lambda"
529+
tasks:
530+
- name: test_aws_lambda_task_group

Diff for: ‎.evergreen/run-tests-deployed-lambda.sh

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ set_env_vars
1010
set_env_python
1111
set_env_ruby
1212

13-
echo MONGODB_URI: ${MONGODB_URI}
14-
1513
export MONGODB_URI=${MONGODB_URI}
1614
export TEST_LAMBDA_DIRECTORY=`dirname "$0"`/../spec/faas/ruby-sam-app
1715

0 commit comments

Comments
 (0)