Skip to content

Commit

Permalink
[55] update content of country exportsh and its deployment for turnke…
Browse files Browse the repository at this point in the history
…y curator portal (#60)

* Update country exporter

* Update export/aggregate container creation process

* Remove covid related outdated code

* Update full export and transform

* Update tests

* Update env for test

* Update aggregate-ci.yml

* Update aggregate-ci.yml

* Remove SGTF field and update format of all_data file

* verification in query

* Lint issue resolve
  • Loading branch information
stanislaw-zakrzewski committed Mar 7, 2024
1 parent 3cb76c6 commit cb0836a
Show file tree
Hide file tree
Showing 27 changed files with 142 additions and 6,492 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/aggregate-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,24 @@ on:
branches: [main]
paths:
- '.github/workflows/aggregate-ci.yml'
- 'data-serving/scripts/aggregate-covid19/aggregate/**'
- 'data-serving/scripts/aggregate-data/aggregate/**'
pull_request:
paths:
- '.github/workflows/aggregate-ci.yml'
- 'data-serving/scripts/aggregate-covid19/aggregate/**'
- 'data-serving/scripts/aggregate-data/aggregate/**'
workflow_dispatch:

jobs:
ci:
runs-on: ubuntu-20.04
defaults:
run:
working-directory: data-serving/scripts/aggregate-covid19/aggregate
working-directory: data-serving/scripts/aggregate-data/aggregate
env:
S3_AGGREGATE_BUCKET: 'mock-aggregate-bucket'
S3_MAP_DATA_BUCKET: 'mock-map-data-bucket'
CONN: 'mock-conn'
DATABASE_NAME: 'mock-database-name'
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.10
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/aggregate-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
branches: [main]
paths:
- '.github/workflows/aggregate-deploy.yml'
- 'data-serving/scripts/aggregate-covid19/**'
- '!data-serving/scripts/aggregate-covid19/README.md'
- 'data-serving/scripts/aggregate-data/**'
- '!data-serving/scripts/aggregate-data/README.md'
workflow_dispatch:

jobs:
Expand All @@ -26,10 +26,10 @@ jobs:
uses: aws-actions/amazon-ecr-login@v1

- name: Build, tag, and push image to Amazon ECR (latest)
working-directory: data-serving/scripts/aggregate-covid19/aggregate
working-directory: data-serving/scripts/aggregate-data/aggregate
env:
REGISTRY: ${{ steps.login-ecr.outputs.registry }}
REPO: gdh-map-aggregator
REPO: gdh-tcp-map-aggregator
IMAGE_TAG: ${{ github.sha }}
run: |
docker build -t $REGISTRY/$REPO:$IMAGE_TAG -t $REGISTRY/$REPO .
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/export-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:
working-directory: data-serving/scripts/export-data
env:
REGISTRY: ${{ steps.login-ecr.outputs.registry }}
REPO_COUNTRY: gdh-country-exporter
REPO_FULL: gdh-full-exporter
REPO_COUNTRY: gdh-tcp-country-exporter
REPO_FULL: gdh-tcp-full-exporter
IMAGE_TAG: ${{ github.sha }}
run: |
docker build -t $REGISTRY/$REPO_COUNTRY:$IMAGE_TAG -t $REGISTRY/$REPO_COUNTRY .
Expand Down
13 changes: 0 additions & 13 deletions data-serving/scripts/aggregate-covid19/README.md

This file was deleted.

9 changes: 0 additions & 9 deletions data-serving/scripts/aggregate-covid19/aggregate/Dockerfile

This file was deleted.

Loading

0 comments on commit cb0836a

Please sign in to comment.