diff --git a/.evergreen/config.yml b/.evergreen/config.yml index e41d305254..06340d9a5f 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -179,7 +179,7 @@ functions: IAM_AUTH_ECS_SECURITY_GROUP="${iam_auth_ecs_security_group}" IAM_AUTH_ECS_SUBNET_A="${iam_auth_ecs_subnet_a}" IAM_AUTH_ECS_SUBNET_B="${iam_auth_ecs_subnet_b}" - IAM_AUTH_ECS_TASK_DEFINITION="${iam_auth_ecs_task_definition}" + IAM_AUTH_ECS_TASK_DEFINITION="${iam_auth_ecs_task_definition_ubuntu2004}" IAM_WEB_IDENTITY_ISSUER="${iam_web_identity_issuer}" IAM_WEB_IDENTITY_JWKS_URI="${iam_web_identity_jwks_uri}" @@ -972,7 +972,7 @@ axes: display_name: jruby-9.4 variables: RVM_RUBY: "jruby-9.4" - + - id: "os" display_name: OS values: @@ -982,6 +982,9 @@ axes: - id: ubuntu2204 display_name: "Ubuntu 22.04" run_on: ubuntu2204-small + - id: ubuntu2004 + display_name: "Ubuntu 20.04" + run_on: ubuntu2004-small - id: rhel8 display_name: "RHEL 8" run_on: rhel80-small @@ -1530,7 +1533,7 @@ buildvariants: # (depending on server version and what's available), we can bump this to # the latest stable db version. mongodb-version: "5.3" - os: rhel8 + os: ubuntu2004 display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}" tasks: - name: "test-aws-auth" diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb index e6f101e8bd..882c38b730 100644 --- a/.evergreen/config/axes.yml.erb +++ b/.evergreen/config/axes.yml.erb @@ -186,7 +186,7 @@ axes: display_name: jruby-9.4 variables: RVM_RUBY: "jruby-9.4" - + - id: "os" display_name: OS values: @@ -196,6 +196,9 @@ axes: - id: ubuntu2204 display_name: "Ubuntu 22.04" run_on: ubuntu2204-small + - id: ubuntu2004 + display_name: "Ubuntu 20.04" + run_on: ubuntu2004-small - id: rhel8 display_name: "RHEL 8" run_on: rhel80-small diff --git a/.evergreen/config/common.yml.erb b/.evergreen/config/common.yml.erb index 90e8def128..67d72dc942 100644 --- a/.evergreen/config/common.yml.erb +++ b/.evergreen/config/common.yml.erb @@ -176,7 +176,7 @@ functions: IAM_AUTH_ECS_SECURITY_GROUP="${iam_auth_ecs_security_group}" IAM_AUTH_ECS_SUBNET_A="${iam_auth_ecs_subnet_a}" IAM_AUTH_ECS_SUBNET_B="${iam_auth_ecs_subnet_b}" - IAM_AUTH_ECS_TASK_DEFINITION="${iam_auth_ecs_task_definition}" + IAM_AUTH_ECS_TASK_DEFINITION="${iam_auth_ecs_task_definition_ubuntu2004}" IAM_WEB_IDENTITY_ISSUER="${iam_web_identity_issuer}" IAM_WEB_IDENTITY_JWKS_URI="${iam_web_identity_jwks_uri}" diff --git a/.evergreen/config/standard.yml.erb b/.evergreen/config/standard.yml.erb index aa7f68c59d..dbf9c1788c 100644 --- a/.evergreen/config/standard.yml.erb +++ b/.evergreen/config/standard.yml.erb @@ -376,7 +376,7 @@ buildvariants: # (depending on server version and what's available), we can bump this to # the latest stable db version. mongodb-version: <%= latest_5x_mdb %> - os: rhel8 + os: ubuntu2004 display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}" tasks: - name: "test-aws-auth" diff --git a/.evergreen/provision-local b/.evergreen/provision-local index 3ad2654b4b..1ce14d240c 100755 --- a/.evergreen/provision-local +++ b/.evergreen/provision-local @@ -27,5 +27,5 @@ sudo env DEBIAN_FRONTEND=noninteractive \ # Need binutils for `strings` utility per # https://aws.amazon.com/premiumsupport/knowledge-center/ecs-iam-task-roles-config-errors/ sudo env DEBIAN_FRONTEND=noninteractive \ - apt-get install -y libsnmp30 libyaml-0-2 gcc make git lsb-release \ - krb5-user bzip2 libgmp-dev python-pip python2.7-dev binutils + apt-get install -y libsnmp35 libyaml-0-2 gcc make git lsb-release \ + krb5-user bzip2 libgmp-dev python3-pip python2.7-dev binutils diff --git a/.evergreen/run-tests-aws-auth.sh b/.evergreen/run-tests-aws-auth.sh index 1813400700..c9649e4a64 100755 --- a/.evergreen/run-tests-aws-auth.sh +++ b/.evergreen/run-tests-aws-auth.sh @@ -97,9 +97,11 @@ case "$AUTH" in aws-web-identity) cd `dirname "$0"`/auth_aws - . ./activate_venv.sh + echo "Activating virtual environment 'authawsvenv'..." + . ./activate-authawsvenv.sh export AWS_ACCESS_KEY_ID="`get_var IAM_AUTH_EC2_INSTANCE_ACCOUNT`" export AWS_SECRET_ACCESS_KEY="`get_var IAM_AUTH_EC2_INSTANCE_SECRET_ACCESS_KEY`" + echo "Unassigning instance profile..." python -u lib/aws_unassign_instance_profile.py unset AWS_ACCESS_KEY_ID unset AWS_SECRET_ACCESS_KEY @@ -113,6 +115,7 @@ case "$AUTH" in unset IDP_JWKS_URI unset IDP_RSA_KEY + deactivate cd - export MONGO_RUBY_DRIVER_AWS_AUTH_ACCESS_KEY_ID="`get_var IAM_AUTH_EC2_INSTANCE_ACCOUNT`" export MONGO_RUBY_DRIVER_AWS_AUTH_SECRET_ACCESS_KEY="`get_var IAM_AUTH_EC2_INSTANCE_SECRET_ACCESS_KEY`" diff --git a/spec/shared b/spec/shared index ce1f8945bd..bd968a969a 160000 --- a/spec/shared +++ b/spec/shared @@ -1 +1 @@ -Subproject commit ce1f8945bd61e614ca4cc7a24d95d16071c46a59 +Subproject commit bd968a969aed7ae4d579855f2ce5b3e3201444a4