@@ -722,7 +722,7 @@ functions:
722
722
"iam_auth_ecs_secret_access_key" : "${iam_auth_ecs_secret_access_key}",
723
723
"iam_auth_ecs_account_arn": "arn:aws:iam::557821124784:user/authtest_fargate_user",
724
724
"iam_auth_ecs_cluster": "${iam_auth_ecs_cluster}",
725
- "iam_auth_ecs_task_definition": "${iam_auth_ecs_task_definition }",
725
+ "iam_auth_ecs_task_definition": "${iam_auth_ecs_task_definition_ubuntu2004 }",
726
726
"iam_auth_ecs_subnet_a": "${iam_auth_ecs_subnet_a}",
727
727
"iam_auth_ecs_subnet_b": "${iam_auth_ecs_subnet_b}",
728
728
"iam_auth_ecs_security_group": "${iam_auth_ecs_security_group}",
@@ -759,7 +759,7 @@ functions:
759
759
silent : true
760
760
script : |
761
761
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
762
- alias urlencode='python -c "import sys, urllib as ul ; sys.stdout.write(ul .quote_plus(sys.argv[1]))"'
762
+ alias urlencode='python3 -c "import sys, urllib.parse as ulp ; sys.stdout.write(ulp .quote_plus(sys.argv[1]))"'
763
763
USER=$(urlencode ${iam_auth_ecs_account})
764
764
PASS=$(urlencode ${iam_auth_ecs_secret_access_key})
765
765
MONGODB_URI="mongodb://$USER:$PASS@localhost"
@@ -793,8 +793,8 @@ functions:
793
793
script : |
794
794
# DO NOT ECHO WITH XTRACE
795
795
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
796
- alias urlencode='python -c "import sys, urllib as ul ; sys.stdout.write(ul .quote_plus(sys.argv[1]))"'
797
- alias jsonkey='python -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
796
+ alias urlencode='python3 -c "import sys, urllib.parse as ulp ; sys.stdout.write(ulp .quote_plus(sys.argv[1]))"'
797
+ alias jsonkey='python3 -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
798
798
USER=$(jsonkey AccessKeyId)
799
799
USER=$(urlencode $USER)
800
800
PASS=$(jsonkey SecretAccessKey)
@@ -2368,11 +2368,9 @@ axes:
2368
2368
GCC_PATH : " /cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
2369
2369
GO_DIST : " C:\\ golang\\ go1.20"
2370
2370
SKIP_ECS_AUTH_TEST : true
2371
- # TODO(BUILD-17329): Update this to Ubuntu 22 after we add a new ECS task
2372
- # definition.
2373
- - id : " ubuntu1804-64-go-1-20"
2374
- display_name : " Ubuntu 18.04"
2375
- run_on : ubuntu1804-test
2371
+ - id : " ubuntu2004-64-go-1-20"
2372
+ display_name : " Ubuntu 20.04"
2373
+ run_on : ubuntu2004-test
2376
2374
variables :
2377
2375
GO_DIST : " /opt/golang/go1.20"
2378
2376
- id : " macos11-go-1-20"
0 commit comments