Skip to content

Commit be33203

Browse files
blink1073qingyang-hu
authored andcommitted
GODRIVER-3010 [master] Update ECS Test to use Ubuntu 20.04 (#1431)
1 parent 2f18f65 commit be33203

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

.evergreen/config.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ functions:
722722
"iam_auth_ecs_secret_access_key" : "${iam_auth_ecs_secret_access_key}",
723723
"iam_auth_ecs_account_arn": "arn:aws:iam::557821124784:user/authtest_fargate_user",
724724
"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}",
726726
"iam_auth_ecs_subnet_a": "${iam_auth_ecs_subnet_a}",
727727
"iam_auth_ecs_subnet_b": "${iam_auth_ecs_subnet_b}",
728728
"iam_auth_ecs_security_group": "${iam_auth_ecs_security_group}",
@@ -759,7 +759,7 @@ functions:
759759
silent: true
760760
script: |
761761
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]))"'
763763
USER=$(urlencode ${iam_auth_ecs_account})
764764
PASS=$(urlencode ${iam_auth_ecs_secret_access_key})
765765
MONGODB_URI="mongodb://$USER:$PASS@localhost"
@@ -793,8 +793,8 @@ functions:
793793
script: |
794794
# DO NOT ECHO WITH XTRACE
795795
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'
798798
USER=$(jsonkey AccessKeyId)
799799
USER=$(urlencode $USER)
800800
PASS=$(jsonkey SecretAccessKey)
@@ -2368,11 +2368,9 @@ axes:
23682368
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
23692369
GO_DIST: "C:\\golang\\go1.20"
23702370
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
23762374
variables:
23772375
GO_DIST: "/opt/golang/go1.20"
23782376
- id: "macos11-go-1-20"

0 commit comments

Comments
 (0)