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

[1pt] Update for calib db pathing to work in AWS #812

Merged
merged 6 commits into from
Feb 17, 2023
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
15 changes: 13 additions & 2 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
All notable changes to this project will be documented in this file.
We follow the [Semantic Versioning 2.0.0](http://semver.org/) format.

## v4.1.3.0 - 2023-02-13 - [PR#812](https://github.com/NOAA-OWP/inundation-mapping/pull/812)

An update was required to adjust host name when in the AWS environment

### Changes

- `fim_post_processing.sh`: Added an "if isAWS" flag system based on the input command args from fim_pipeline.sh or

- `tools/calibration-db`
- `README.md`: Minor text correction.

<br/><br/>

## v4.1.2.0 - 2023-02-15 - [PR#808](https://github.com/NOAA-OWP/inundation-mapping/pull/808)

Add `pytest` package and refactor existing unit tests. Update parameters to unit tests (`/unit_tests/*_params.json`) to valid paths. Add leading slash to paths in `/config/params_template.env`.
Expand Down Expand Up @@ -59,7 +72,6 @@ Add `pytest` package and refactor existing unit tests. Update parameters to unit

<br/><br/>


## v4.1.1.0 - 2023-02-16 - [PR#809](https://github.com/NOAA-OWP/inundation-mapping/pull/809)

The CatFIM code was updated to allow 1-foot interval processing across all stage-based AHPS sites ranging from action stage to 5 feet above major stage, along with restart capability for interrupted processing runs.
Expand All @@ -74,7 +86,6 @@ The CatFIM code was updated to allow 1-foot interval processing across all stage

<br/><br/>


## v4.1.0.0 - 2023-01-30 - [PR#806](https://github.com/NOAA-OWP/inundation-mapping/pull/806)

As we move to Amazon Web Service, AWS, we need to change our processing system. Currently, it is `gms_pipeline.sh` using bash "parallel" as an iterator which then first processes all HUCs, but not their branches. One of `gms_pipeline.sh`'s next steps is to do branch processing which is again iterated via "parallel". AKA. Units processed as one step, branches processed as second independent step.
Expand Down
6 changes: 6 additions & 0 deletions fim_post_processing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@ if [ "$src_adjust_spatial" = "True" ] && [ "$skipcal" = "0" ]; then
when we start up that part of the sytem and it does not like the word
export.
'

# Pick up the docker parent host machine name and override the one coming from the config file (aws only)
if [ "$isAWS" = "1" ]; then
CALIBRATION_DB_HOST=$(curl http://169.254.169.254/latest/meta-data/local-ipv4 -s)
fi

export CALIBRATION_DB_HOST=$CALIBRATION_DB_HOST
export CALIBRATION_DB_NAME=$CALIBRATION_DB_NAME
export CALIBRATION_DB_USER_NAME=$CALIBRATION_DB_USER_NAME
Expand Down
4 changes: 3 additions & 1 deletion tools/calibration-db/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ Steps:
Using a bash terminal window, run
`docker-compose down`
`rm -rf pgdata`


If that command errors out, use `docker-compose down --rmi local -v --remove-orphans`.

-------------------------------
## Debugging Postgres DB

Expand Down