File tree Expand file tree Collapse file tree 7 files changed +19
-10
lines changed Expand file tree Collapse file tree 7 files changed +19
-10
lines changed Original file line number Diff line number Diff line change @@ -179,7 +179,7 @@ functions:
179
179
IAM_AUTH_ECS_SECURITY_GROUP="${iam_auth_ecs_security_group}"
180
180
IAM_AUTH_ECS_SUBNET_A="${iam_auth_ecs_subnet_a}"
181
181
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 }"
183
183
184
184
IAM_WEB_IDENTITY_ISSUER="${iam_web_identity_issuer}"
185
185
IAM_WEB_IDENTITY_JWKS_URI="${iam_web_identity_jwks_uri}"
@@ -972,7 +972,7 @@ axes:
972
972
display_name : jruby-9.4
973
973
variables :
974
974
RVM_RUBY : " jruby-9.4"
975
-
975
+
976
976
- id : " os"
977
977
display_name : OS
978
978
values :
@@ -982,6 +982,9 @@ axes:
982
982
- id : ubuntu2204
983
983
display_name : " Ubuntu 22.04"
984
984
run_on : ubuntu2204-small
985
+ - id : ubuntu2004
986
+ display_name : " Ubuntu 20.04"
987
+ run_on : ubuntu2004-small
985
988
- id : rhel8
986
989
display_name : " RHEL 8"
987
990
run_on : rhel80-small
@@ -1530,7 +1533,7 @@ buildvariants:
1530
1533
# (depending on server version and what's available), we can bump this to
1531
1534
# the latest stable db version.
1532
1535
mongodb-version : " 5.3"
1533
- os : rhel8
1536
+ os : ubuntu2004
1534
1537
display_name : " AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
1535
1538
tasks :
1536
1539
- name : " test-aws-auth"
Original file line number Diff line number Diff line change @@ -186,7 +186,7 @@ axes:
186
186
display_name: jruby-9.4
187
187
variables:
188
188
RVM_RUBY: "jruby-9.4"
189
-
189
+
190
190
- id: "os"
191
191
display_name: OS
192
192
values:
@@ -196,6 +196,9 @@ axes:
196
196
- id: ubuntu2204
197
197
display_name: "Ubuntu 22.04"
198
198
run_on: ubuntu2204-small
199
+ - id: ubuntu2004
200
+ display_name: "Ubuntu 20.04"
201
+ run_on: ubuntu2004-small
199
202
- id: rhel8
200
203
display_name: "RHEL 8"
201
204
run_on: rhel80-small
Original file line number Diff line number Diff line change @@ -176,7 +176,7 @@ functions:
176
176
IAM_AUTH_ECS_SECURITY_GROUP="${iam_auth_ecs_security_group}"
177
177
IAM_AUTH_ECS_SUBNET_A="${iam_auth_ecs_subnet_a}"
178
178
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 }"
180
180
181
181
IAM_WEB_IDENTITY_ISSUER="${iam_web_identity_issuer}"
182
182
IAM_WEB_IDENTITY_JWKS_URI="${iam_web_identity_jwks_uri}"
Original file line number Diff line number Diff line change @@ -376,7 +376,7 @@ buildvariants:
376
376
# (depending on server version and what's available), we can bump this to
377
377
# the latest stable db version.
378
378
mongodb-version: <%= latest_5x_mdb %>
379
- os: rhel8
379
+ os: ubuntu2004
380
380
display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
381
381
tasks:
382
382
- name: "test-aws-auth"
Original file line number Diff line number Diff line change @@ -27,5 +27,5 @@ sudo env DEBIAN_FRONTEND=noninteractive \
27
27
# Need binutils for `strings` utility per
28
28
# https://aws.amazon.com/premiumsupport/knowledge-center/ecs-iam-task-roles-config-errors/
29
29
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
Original file line number Diff line number Diff line change @@ -97,9 +97,11 @@ case "$AUTH" in
97
97
aws-web-identity)
98
98
cd ` dirname " $0 " ` /auth_aws
99
99
100
- . ./activate_venv.sh
100
+ echo " Activating virtual environment 'authawsvenv'..."
101
+ . ./activate-authawsvenv.sh
101
102
export AWS_ACCESS_KEY_ID=" ` get_var IAM_AUTH_EC2_INSTANCE_ACCOUNT` "
102
103
export AWS_SECRET_ACCESS_KEY=" ` get_var IAM_AUTH_EC2_INSTANCE_SECRET_ACCESS_KEY` "
104
+ echo " Unassigning instance profile..."
103
105
python -u lib/aws_unassign_instance_profile.py
104
106
unset AWS_ACCESS_KEY_ID
105
107
unset AWS_SECRET_ACCESS_KEY
@@ -113,6 +115,7 @@ case "$AUTH" in
113
115
unset IDP_JWKS_URI
114
116
unset IDP_RSA_KEY
115
117
118
+ deactivate
116
119
cd -
117
120
export MONGO_RUBY_DRIVER_AWS_AUTH_ACCESS_KEY_ID=" ` get_var IAM_AUTH_EC2_INSTANCE_ACCOUNT` "
118
121
export MONGO_RUBY_DRIVER_AWS_AUTH_SECRET_ACCESS_KEY=" ` get_var IAM_AUTH_EC2_INSTANCE_SECRET_ACCESS_KEY` "
You can’t perform that action at this time.
0 commit comments