From 237eae4dd10d1492fa641e5f268ceb4b06a781cf Mon Sep 17 00:00:00 2001 From: Long Vu Date: Wed, 20 Nov 2024 22:45:10 -0500 Subject: [PATCH 1/6] fix regression introduced by PR #359 "Flexible locations for data served by thredds" In PR https://github.com/bird-house/birdhouse-deploy/pull/359/: `secure-thredds/config/magpie/permissions.cfg` started to use variable but was never renamed to `.template` so those variable never get template expanded (commit 317d96c39db7a6d79d1568a7094441ccdedc55ae). `bootstrap-testdata` default value was removed but did not source `read-configs.include.sh` so the variable stayed blank (commit 4ab0fc74cb8fa601d75ecfc2a94749b23f60109c). The default value was there initially so the script can be used in standalone situation (not inside a checkout). --- .../secure-thredds/config/magpie/.gitignore | 1 + ...ermissions.cfg => permissions.cfg.template} | 0 birdhouse/scripts/bootstrap-testdata | 18 +++++++++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 birdhouse/optional-components/secure-thredds/config/magpie/.gitignore rename birdhouse/optional-components/secure-thredds/config/magpie/{permissions.cfg => permissions.cfg.template} (100%) diff --git a/birdhouse/optional-components/secure-thredds/config/magpie/.gitignore b/birdhouse/optional-components/secure-thredds/config/magpie/.gitignore new file mode 100644 index 000000000..e4339d698 --- /dev/null +++ b/birdhouse/optional-components/secure-thredds/config/magpie/.gitignore @@ -0,0 +1 @@ +permissions.cfg diff --git a/birdhouse/optional-components/secure-thredds/config/magpie/permissions.cfg b/birdhouse/optional-components/secure-thredds/config/magpie/permissions.cfg.template similarity index 100% rename from birdhouse/optional-components/secure-thredds/config/magpie/permissions.cfg rename to birdhouse/optional-components/secure-thredds/config/magpie/permissions.cfg.template diff --git a/birdhouse/scripts/bootstrap-testdata b/birdhouse/scripts/bootstrap-testdata index 0c2f4c278..19bbea2ec 100755 --- a/birdhouse/scripts/bootstrap-testdata +++ b/birdhouse/scripts/bootstrap-testdata @@ -10,8 +10,22 @@ # Need write-access to DATASET_ROOT (/data/datasets/). +THIS_FILE="$(readlink -f "$0" || realpath "$0")" +THIS_DIR="$(dirname "${THIS_FILE}")" +COMPOSE_DIR="${COMPOSE_DIR:-$(dirname "${THIS_DIR}")}" + +if [ -f "${COMPOSE_DIR}/read-configs.include.sh" ]; then + . "${COMPOSE_DIR}/read-configs.include.sh" + + # Get THREDDS_SERVICE_DATA_LOCATION_ON_HOST + read_configs +fi + + if [ -z "${DATASET_ROOT}" ]; then - DATASET_ROOT="${BIRDHOUSE_DATA_PERSIST_ROOT}/${THREDDS_SERVICE_DATA_LOCATION_ON_HOST}" + # Default for when unable to source read-configs.include.sh (ie when + # used standalone outside of the checkout). + DATASET_ROOT="${THREDDS_SERVICE_DATA_LOCATION_ON_HOST:=/data/datasets}" fi FROM_SERVER=${FROM_SERVER:-"https://pavics.ouranos.ca/twitcher/ows/proxy/thredds/fileServer/birdhouse"} @@ -39,6 +53,8 @@ for afile in ${FILE_LIST}; do if [ ! -d "${PARENT_DIRS}" ]; then mkdir -p "${PARENT_DIRS}" fi + set -e # Fail on error. curl "${FROM_SERVER}/${afile}" --output "${afile}" + set +e fi done From eea873362dbdf91b4341efdd8205aa1e3b368134 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Wed, 20 Nov 2024 23:01:30 -0500 Subject: [PATCH 2/6] CHANGES.md: Fix regressions introduced by PR #359 "Flexible locations for data served by thredds" --- CHANGES.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index b20880015..34ed6c6fe 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,20 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ -[//]: # (list changes here, using '-' for each new entry, remove this when items are added) +## Fixes + +- Fix regressions introduced by PR #359 "Flexible locations for data served by thredds" + + In [PR #359](https://github.com/bird-house/birdhouse-deploy/pull/359/): + + `secure-thredds/config/magpie/permissions.cfg` started to use variable but was never renamed to `.template` + so those variable never get template expanded + (commit [317d96c3](https://github.com/bird-house/birdhouse-deploy/commit/317d96c39db7a6d79d1568a7094441ccdedc55ae)). + + `bootstrap-testdata` default value was removed but did not source `read-configs.include.sh` so the variable + stayed blank (commit [4ab0fc74](https://github.com/bird-house/birdhouse-deploy/commit/4ab0fc74cb8fa601d75ecfc2a94749b23f60109c)). + The default value was there initially so the script can be used in standalone situation (not inside a checkout). + [2.6.0](https://github.com/bird-house/birdhouse-deploy/tree/2.6.0) (2024-11-19) ------------------------------------------------------------------------------------------------------------------ From 3b036c5f7e46094142cc8ce5c408baf4b295b33a Mon Sep 17 00:00:00 2001 From: Long Vu Date: Thu, 21 Nov 2024 14:56:00 -0500 Subject: [PATCH 3/6] bootstrap-testdata: do not use ':=', review feedback See https://github.com/bird-house/birdhouse-deploy/pull/478#discussion_r1852187703 --- birdhouse/scripts/bootstrap-testdata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/birdhouse/scripts/bootstrap-testdata b/birdhouse/scripts/bootstrap-testdata index 19bbea2ec..d337b718c 100755 --- a/birdhouse/scripts/bootstrap-testdata +++ b/birdhouse/scripts/bootstrap-testdata @@ -25,7 +25,7 @@ fi if [ -z "${DATASET_ROOT}" ]; then # Default for when unable to source read-configs.include.sh (ie when # used standalone outside of the checkout). - DATASET_ROOT="${THREDDS_SERVICE_DATA_LOCATION_ON_HOST:=/data/datasets}" + DATASET_ROOT="${THREDDS_SERVICE_DATA_LOCATION_ON_HOST:-${BIRDHOUSE_DATA_PERSIST_ROOT:-/data}/datasets}" fi FROM_SERVER=${FROM_SERVER:-"https://pavics.ouranos.ca/twitcher/ows/proxy/thredds/fileServer/birdhouse"} From 0525e4746aab9f8993118fc9eedc0d927d79e238 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Thu, 21 Nov 2024 15:01:15 -0500 Subject: [PATCH 4/6] bootstrap-testdata: forgot to indicate where BIRDHOUSE_DATA_PERSIST_ROOT comes from --- birdhouse/scripts/bootstrap-testdata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/birdhouse/scripts/bootstrap-testdata b/birdhouse/scripts/bootstrap-testdata index d337b718c..d7eaf0dee 100755 --- a/birdhouse/scripts/bootstrap-testdata +++ b/birdhouse/scripts/bootstrap-testdata @@ -17,7 +17,7 @@ COMPOSE_DIR="${COMPOSE_DIR:-$(dirname "${THIS_DIR}")}" if [ -f "${COMPOSE_DIR}/read-configs.include.sh" ]; then . "${COMPOSE_DIR}/read-configs.include.sh" - # Get THREDDS_SERVICE_DATA_LOCATION_ON_HOST + # Get THREDDS_SERVICE_DATA_LOCATION_ON_HOST, BIRDHOUSE_DATA_PERSIST_ROOT read_configs fi From ba934b835deb0d31a6867e032d6ef5ab6bd59d7b Mon Sep 17 00:00:00 2001 From: Long Vu Date: Thu, 21 Nov 2024 23:45:26 -0500 Subject: [PATCH 5/6] bootstrap-testdata: allow to configure DATASET_ROOT --- birdhouse/scripts/bootstrap-testdata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/birdhouse/scripts/bootstrap-testdata b/birdhouse/scripts/bootstrap-testdata index d7eaf0dee..20c680bce 100755 --- a/birdhouse/scripts/bootstrap-testdata +++ b/birdhouse/scripts/bootstrap-testdata @@ -25,7 +25,7 @@ fi if [ -z "${DATASET_ROOT}" ]; then # Default for when unable to source read-configs.include.sh (ie when # used standalone outside of the checkout). - DATASET_ROOT="${THREDDS_SERVICE_DATA_LOCATION_ON_HOST:-${BIRDHOUSE_DATA_PERSIST_ROOT:-/data}/datasets}" + DATASET_ROOT="${DATASET_ROOT:-${THREDDS_SERVICE_DATA_LOCATION_ON_HOST:-${BIRDHOUSE_DATA_PERSIST_ROOT:-/data}/datasets}}" fi FROM_SERVER=${FROM_SERVER:-"https://pavics.ouranos.ca/twitcher/ows/proxy/thredds/fileServer/birdhouse"} From 75f972614803f7cc5a986b77989b317f68500e0f Mon Sep 17 00:00:00 2001 From: Long Vu Date: Fri, 22 Nov 2024 10:57:16 -0500 Subject: [PATCH 6/6] =?UTF-8?q?Bump=20version:=202.6.0=20=E2=86=92=202.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 6 +++--- CHANGES.md | 5 +++++ Makefile | 2 +- README.rst | 8 ++++---- RELEASE.txt | 2 +- .../canarie-api/docker_configuration.py.template | 8 ++++---- docs/source/conf.py | 4 ++-- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 2bac4e005..f6aca57cd 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.6.0 +current_version = 2.6.1 commit = True tag = False tag_name = {new_version} @@ -30,11 +30,11 @@ search = {current_version} replace = {new_version} [bumpversion:file:RELEASE.txt] -search = {current_version} 2024-11-19T13:53:14Z +search = {current_version} 2024-11-22T15:57:16Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2024-11-19T13:53:14Z +values = 2024-11-22T15:57:16Z [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index 34ed6c6fe..cdde4e354 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,11 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ +[//]: # (list changes here, using '-' for each new entry, remove this when items are added) + +[2.6.1](https://github.com/bird-house/birdhouse-deploy/tree/2.6.1) (2024-11-22) +------------------------------------------------------------------------------------------------------------------ + ## Fixes - Fix regressions introduced by PR #359 "Flexible locations for data served by thredds" diff --git a/Makefile b/Makefile index 178116bd2..4898723ba 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 2.6.0 +override APP_VERSION := 2.6.1 # utility to remove comments after value of an option variable override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g") diff --git a/README.rst b/README.rst index 3d0a9963c..1beff68f2 100644 --- a/README.rst +++ b/README.rst @@ -18,13 +18,13 @@ for a full-fledged production platform. * - citation - | |citation| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.6.0.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.6.1.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.0...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.1...master -.. |latest-version| image:: https://img.shields.io/badge/tag-2.6.0-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.6.1-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/2.6.0 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.6.1 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest :alt: ReadTheDocs Build Status (latest version) diff --git a/RELEASE.txt b/RELEASE.txt index 9200ea1cd..e7298cd33 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.6.0 2024-11-19T13:53:14Z +2.6.1 2024-11-22T15:57:16Z diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index fc82b7d34..22f6cb7b5 100644 --- a/birdhouse/components/canarie-api/docker_configuration.py.template +++ b/birdhouse/components/canarie-api/docker_configuration.py.template @@ -108,8 +108,8 @@ SERVICES = { # NOTE: # Below version and release time auto-managed by 'make VERSION=x.y.z bump'. # Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'. - 'version': '2.6.0', - 'releaseTime': '2024-11-19T13:53:14Z', + 'version': '2.6.1', + 'releaseTime': '2024-11-22T15:57:16Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', @@ -141,8 +141,8 @@ PLATFORMS = { # NOTE: # Below version and release time auto-managed by 'make VERSION=x.y.z bump'. # Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'. - 'version': '2.6.0', - 'releaseTime': '2024-11-19T13:53:14Z', + 'version': '2.6.1', + 'releaseTime': '2024-11-22T15:57:16Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index a6e0fba86..f801553bd 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '2.6.0' +version = '2.6.1' # The full version, including alpha/beta/rc tags. -release = '2.6.0' +release = '2.6.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.