Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert AWS CLI upgrade and temporarily disable Tilegarden deployment #844

Merged
merged 3 commits into from
Jun 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

#### Changed
- Increase timeout and reduce retries for analysis import tasks
- Revert AWS CLI v2 upgrade and adjust `cipublish` to work with v1

## [0.15.0] - 2021-02-17

Expand Down
2 changes: 1 addition & 1 deletion deployment/ansible/pfb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

roles:
- { role: "azavea.terraform" }
- { role: "pfb.aws-cli2" }
- { role: "pfb.aws-cli" }
- { role: "pfb.env" }
- { role: "pfb.docker" }
- { role: "pfb.boto3" }
3 changes: 3 additions & 0 deletions deployment/ansible/roles/pfb.aws-cli/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---

aws_cli_version: 1.18.219
3 changes: 3 additions & 0 deletions deployment/ansible/roles/pfb.aws-cli/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
- name: Install AWS Command Line Interface
pip: name=awscli version="{{ aws_cli_version }}"
3 changes: 0 additions & 3 deletions deployment/ansible/roles/pfb.aws-cli2/defaults/main.yml

This file was deleted.

22 changes: 0 additions & 22 deletions deployment/ansible/roles/pfb.aws-cli2/tasks/main.yml

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/cipublish
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
if [[ -n "${PFB_AWS_ECR_ENDPOINT}" ]]; then
# Evaluate the return value of the get-login subcommand, which
# is a docker login command with temporarily ECR credentials.
docker login -u AWS -p "$(aws ecr get-login-password)" "${PFB_AWS_ECR_ENDPOINT}"
eval "$(aws ecr get-login --no-include-email)"

docker tag "pfb-nginx:${GIT_COMMIT}" \
"${PFB_AWS_ECR_ENDPOINT}/pfb-nginx:${GIT_COMMIT}"
Expand Down
17 changes: 9 additions & 8 deletions scripts/infra
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,17 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
apply)
docker-compose run --rm terraform apply "${PFB_SETTINGS_BUCKET}.tfplan"

popd
pushd "${DIR}/.."
# TODO (#843): Restore this once we've gotten Tilegarden deployment working again
# popd
# pushd "${DIR}/.."

aws s3 cp "s3://${PFB_SETTINGS_BUCKET}/tilegarden/.env" "./src/tilegarden/.env"
aws s3 cp "s3://${PFB_SETTINGS_BUCKET}/tilegarden/claudia.json" "./src/tilegarden/claudia/claudia.json"
# aws s3 cp "s3://${PFB_SETTINGS_BUCKET}/tilegarden/.env" "./src/tilegarden/.env"
# aws s3 cp "s3://${PFB_SETTINGS_BUCKET}/tilegarden/claudia.json" "./src/tilegarden/claudia/claudia.json"

docker-compose \
-f docker-compose.yml \
-f docker-compose.test.yml \
run --rm --entrypoint yarn tilegarden deploy
# docker-compose \
# -f docker-compose.yml \
# -f docker-compose.test.yml \
# run --rm --entrypoint yarn tilegarden deploy
;;
plan-mgmt)
update_batch_definitions
Expand Down