Skip to content

Commit 8ea3b2d

Browse files
committed
GODRIVER-3010 Update ECS Test to use Ubuntu 20.04 (mongodb#1422)
(cherry picked from commit 0bb308c)
1 parent 9b3e3c4 commit 8ea3b2d

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

.evergreen/config.yml

+7-9
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ functions:
731731
"iam_auth_ecs_secret_access_key" : "${iam_auth_ecs_secret_access_key}",
732732
"iam_auth_ecs_account_arn": "arn:aws:iam::557821124784:user/authtest_fargate_user",
733733
"iam_auth_ecs_cluster": "${iam_auth_ecs_cluster}",
734-
"iam_auth_ecs_task_definition": "${iam_auth_ecs_task_definition}",
734+
"iam_auth_ecs_task_definition": "${iam_auth_ecs_task_definition_ubuntu2004}",
735735
"iam_auth_ecs_subnet_a": "${iam_auth_ecs_subnet_a}",
736736
"iam_auth_ecs_subnet_b": "${iam_auth_ecs_subnet_b}",
737737
"iam_auth_ecs_security_group": "${iam_auth_ecs_security_group}",
@@ -768,7 +768,7 @@ functions:
768768
silent: true
769769
script: |
770770
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
771-
alias urlencode='python -c "import sys, urllib as ul; sys.stdout.write(ul.quote_plus(sys.argv[1]))"'
771+
alias urlencode='python3 -c "import sys, urllib.parse as ulp; sys.stdout.write(ulp.quote_plus(sys.argv[1]))"'
772772
USER=$(urlencode ${iam_auth_ecs_account})
773773
PASS=$(urlencode ${iam_auth_ecs_secret_access_key})
774774
MONGODB_URI="mongodb://$USER:$PASS@localhost"
@@ -802,8 +802,8 @@ functions:
802802
script: |
803803
# DO NOT ECHO WITH XTRACE
804804
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
805-
alias urlencode='python -c "import sys, urllib as ul; sys.stdout.write(ul.quote_plus(sys.argv[1]))"'
806-
alias jsonkey='python -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
805+
alias urlencode='python3 -c "import sys, urllib.parse as ulp; sys.stdout.write(ulp.quote_plus(sys.argv[1]))"'
806+
alias jsonkey='python3 -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
807807
USER=$(jsonkey AccessKeyId)
808808
USER=$(urlencode $USER)
809809
PASS=$(jsonkey SecretAccessKey)
@@ -2381,11 +2381,9 @@ axes:
23812381
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
23822382
GO_DIST: "C:\\golang\\go1.20"
23832383
SKIP_ECS_AUTH_TEST: true
2384-
# TODO(BUILD-17329): Update this to Ubuntu 22 after we add a new ECS task
2385-
# definition.
2386-
- id: "ubuntu1804-64-go-1-20"
2387-
display_name: "Ubuntu 18.04"
2388-
run_on: ubuntu1804-test
2384+
- id: "ubuntu2004-64-go-1-20"
2385+
display_name: "Ubuntu 20.04"
2386+
run_on: ubuntu2004-test
23892387
variables:
23902388
GO_DIST: "/opt/golang/go1.20"
23912389
- id: "macos11-go-1-20"

0 commit comments

Comments
 (0)