Skip to content

Commit 0bb308c

Browse files
authored
GODRIVER-3010 Update ECS Test to use Ubuntu 20.04 (mongodb#1422)
1 parent 6c39f4f commit 0bb308c

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
@@ -733,7 +733,7 @@ functions:
733733
"iam_auth_ecs_secret_access_key" : "${iam_auth_ecs_secret_access_key}",
734734
"iam_auth_ecs_account_arn": "arn:aws:iam::557821124784:user/authtest_fargate_user",
735735
"iam_auth_ecs_cluster": "${iam_auth_ecs_cluster}",
736-
"iam_auth_ecs_task_definition": "${iam_auth_ecs_task_definition}",
736+
"iam_auth_ecs_task_definition": "${iam_auth_ecs_task_definition_ubuntu2004}",
737737
"iam_auth_ecs_subnet_a": "${iam_auth_ecs_subnet_a}",
738738
"iam_auth_ecs_subnet_b": "${iam_auth_ecs_subnet_b}",
739739
"iam_auth_ecs_security_group": "${iam_auth_ecs_security_group}",
@@ -770,7 +770,7 @@ functions:
770770
silent: true
771771
script: |
772772
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
773-
alias urlencode='python -c "import sys, urllib as ul; sys.stdout.write(ul.quote_plus(sys.argv[1]))"'
773+
alias urlencode='python3 -c "import sys, urllib.parse as ulp; sys.stdout.write(ulp.quote_plus(sys.argv[1]))"'
774774
USER=$(urlencode ${iam_auth_ecs_account})
775775
PASS=$(urlencode ${iam_auth_ecs_secret_access_key})
776776
MONGODB_URI="mongodb://$USER:$PASS@localhost"
@@ -804,8 +804,8 @@ functions:
804804
script: |
805805
# DO NOT ECHO WITH XTRACE
806806
cat <<'EOF' > "${PROJECT_DIRECTORY}/prepare_mongodb_aws.sh"
807-
alias urlencode='python -c "import sys, urllib as ul; sys.stdout.write(ul.quote_plus(sys.argv[1]))"'
808-
alias jsonkey='python -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
807+
alias urlencode='python3 -c "import sys, urllib.parse as ulp; sys.stdout.write(ulp.quote_plus(sys.argv[1]))"'
808+
alias jsonkey='python3 -c "import json,sys;sys.stdout.write(json.load(sys.stdin)[sys.argv[1]])" < ${DRIVERS_TOOLS}/.evergreen/auth_aws/creds.json'
809809
USER=$(jsonkey AccessKeyId)
810810
USER=$(urlencode $USER)
811811
PASS=$(jsonkey SecretAccessKey)
@@ -2387,11 +2387,9 @@ axes:
23872387
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
23882388
GO_DIST: "C:\\golang\\go1.20"
23892389
SKIP_ECS_AUTH_TEST: true
2390-
# TODO(BUILD-17329): Update this to Ubuntu 22 after we add a new ECS task
2391-
# definition.
2392-
- id: "ubuntu1804-64-go-1-20"
2393-
display_name: "Ubuntu 18.04"
2394-
run_on: ubuntu1804-test
2390+
- id: "ubuntu2004-64-go-1-20"
2391+
display_name: "Ubuntu 20.04"
2392+
run_on: ubuntu2004-test
23952393
variables:
23962394
GO_DIST: "/opt/golang/go1.20"
23972395
- id: "macos11-go-1-20"

0 commit comments

Comments
 (0)