@@ -731,7 +731,7 @@ functions:
731
731
"iam_auth_ecs_secret_access_key" : "${iam_auth_ecs_secret_access_key}",
732
732
"iam_auth_ecs_account_arn": "arn:aws:iam::557821124784:user/authtest_fargate_user",
733
733
"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 }",
735
735
"iam_auth_ecs_subnet_a": "${iam_auth_ecs_subnet_a}",
736
736
"iam_auth_ecs_subnet_b": "${iam_auth_ecs_subnet_b}",
737
737
"iam_auth_ecs_security_group": "${iam_auth_ecs_security_group}",
@@ -768,7 +768,7 @@ functions:
768
768
silent : true
769
769
script : |
770
770
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]))"'
772
772
USER=$(urlencode ${iam_auth_ecs_account})
773
773
PASS=$(urlencode ${iam_auth_ecs_secret_access_key})
774
774
MONGODB_URI="mongodb://$USER:$PASS@localhost"
@@ -802,8 +802,8 @@ functions:
802
802
script : |
803
803
# DO NOT ECHO WITH XTRACE
804
804
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'
807
807
USER=$(jsonkey AccessKeyId)
808
808
USER=$(urlencode $USER)
809
809
PASS=$(jsonkey SecretAccessKey)
@@ -2381,11 +2381,9 @@ axes:
2381
2381
GCC_PATH : " /cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
2382
2382
GO_DIST : " C:\\ golang\\ go1.20"
2383
2383
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
2389
2387
variables :
2390
2388
GO_DIST : " /opt/golang/go1.20"
2391
2389
- id : " macos11-go-1-20"
0 commit comments