Skip to content

Commit 511e324

Browse files
RUBY-3333 Update AWS auth tests (#2803)
1 parent 2961065 commit 511e324

File tree

7 files changed

+19
-10
lines changed

7 files changed

+19
-10
lines changed

.evergreen/config.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ functions:
179179
IAM_AUTH_ECS_SECURITY_GROUP="${iam_auth_ecs_security_group}"
180180
IAM_AUTH_ECS_SUBNET_A="${iam_auth_ecs_subnet_a}"
181181
IAM_AUTH_ECS_SUBNET_B="${iam_auth_ecs_subnet_b}"
182-
IAM_AUTH_ECS_TASK_DEFINITION="${iam_auth_ecs_task_definition}"
182+
IAM_AUTH_ECS_TASK_DEFINITION="${iam_auth_ecs_task_definition_ubuntu2004}"
183183
184184
IAM_WEB_IDENTITY_ISSUER="${iam_web_identity_issuer}"
185185
IAM_WEB_IDENTITY_JWKS_URI="${iam_web_identity_jwks_uri}"
@@ -972,7 +972,7 @@ axes:
972972
display_name: jruby-9.4
973973
variables:
974974
RVM_RUBY: "jruby-9.4"
975-
975+
976976
- id: "os"
977977
display_name: OS
978978
values:
@@ -982,6 +982,9 @@ axes:
982982
- id: ubuntu2204
983983
display_name: "Ubuntu 22.04"
984984
run_on: ubuntu2204-small
985+
- id: ubuntu2004
986+
display_name: "Ubuntu 20.04"
987+
run_on: ubuntu2004-small
985988
- id: rhel8
986989
display_name: "RHEL 8"
987990
run_on: rhel80-small
@@ -1530,7 +1533,7 @@ buildvariants:
15301533
# (depending on server version and what's available), we can bump this to
15311534
# the latest stable db version.
15321535
mongodb-version: "5.3"
1533-
os: rhel8
1536+
os: ubuntu2004
15341537
display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
15351538
tasks:
15361539
- name: "test-aws-auth"

.evergreen/config/axes.yml.erb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ axes:
186186
display_name: jruby-9.4
187187
variables:
188188
RVM_RUBY: "jruby-9.4"
189-
189+
190190
- id: "os"
191191
display_name: OS
192192
values:
@@ -196,6 +196,9 @@ axes:
196196
- id: ubuntu2204
197197
display_name: "Ubuntu 22.04"
198198
run_on: ubuntu2204-small
199+
- id: ubuntu2004
200+
display_name: "Ubuntu 20.04"
201+
run_on: ubuntu2004-small
199202
- id: rhel8
200203
display_name: "RHEL 8"
201204
run_on: rhel80-small

.evergreen/config/common.yml.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ functions:
176176
IAM_AUTH_ECS_SECURITY_GROUP="${iam_auth_ecs_security_group}"
177177
IAM_AUTH_ECS_SUBNET_A="${iam_auth_ecs_subnet_a}"
178178
IAM_AUTH_ECS_SUBNET_B="${iam_auth_ecs_subnet_b}"
179-
IAM_AUTH_ECS_TASK_DEFINITION="${iam_auth_ecs_task_definition}"
179+
IAM_AUTH_ECS_TASK_DEFINITION="${iam_auth_ecs_task_definition_ubuntu2004}"
180180

181181
IAM_WEB_IDENTITY_ISSUER="${iam_web_identity_issuer}"
182182
IAM_WEB_IDENTITY_JWKS_URI="${iam_web_identity_jwks_uri}"

.evergreen/config/standard.yml.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ buildvariants:
376376
# (depending on server version and what's available), we can bump this to
377377
# the latest stable db version.
378378
mongodb-version: <%= latest_5x_mdb %>
379-
os: rhel8
379+
os: ubuntu2004
380380
display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
381381
tasks:
382382
- name: "test-aws-auth"

.evergreen/provision-local

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ sudo env DEBIAN_FRONTEND=noninteractive \
2727
# Need binutils for `strings` utility per
2828
# https://aws.amazon.com/premiumsupport/knowledge-center/ecs-iam-task-roles-config-errors/
2929
sudo env DEBIAN_FRONTEND=noninteractive \
30-
apt-get install -y libsnmp30 libyaml-0-2 gcc make git lsb-release \
31-
krb5-user bzip2 libgmp-dev python-pip python2.7-dev binutils
30+
apt-get install -y libsnmp35 libyaml-0-2 gcc make git lsb-release \
31+
krb5-user bzip2 libgmp-dev python3-pip python2.7-dev binutils

.evergreen/run-tests-aws-auth.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,11 @@ case "$AUTH" in
9797
aws-web-identity)
9898
cd `dirname "$0"`/auth_aws
9999

100-
. ./activate_venv.sh
100+
echo "Activating virtual environment 'authawsvenv'..."
101+
. ./activate-authawsvenv.sh
101102
export AWS_ACCESS_KEY_ID="`get_var IAM_AUTH_EC2_INSTANCE_ACCOUNT`"
102103
export AWS_SECRET_ACCESS_KEY="`get_var IAM_AUTH_EC2_INSTANCE_SECRET_ACCESS_KEY`"
104+
echo "Unassigning instance profile..."
103105
python -u lib/aws_unassign_instance_profile.py
104106
unset AWS_ACCESS_KEY_ID
105107
unset AWS_SECRET_ACCESS_KEY
@@ -113,6 +115,7 @@ case "$AUTH" in
113115
unset IDP_JWKS_URI
114116
unset IDP_RSA_KEY
115117

118+
deactivate
116119
cd -
117120
export MONGO_RUBY_DRIVER_AWS_AUTH_ACCESS_KEY_ID="`get_var IAM_AUTH_EC2_INSTANCE_ACCOUNT`"
118121
export MONGO_RUBY_DRIVER_AWS_AUTH_SECRET_ACCESS_KEY="`get_var IAM_AUTH_EC2_INSTANCE_SECRET_ACCESS_KEY`"

0 commit comments

Comments
 (0)