Skip to content

Commit e56c9bb

Browse files
tlvutlvu
authored
Fix scheduler jobs: autodeploy compat with BIRDHOUSE_LOCAL_ENV, deploy raven and xclim testdata missing logs (#601)
## Overview ### Changes - scheduler-job-autodeploy: make compatible with change of `BIRDHOUSE_LOCAL_ENV` via env var and not symlink See #597 (comment). ### Fixes - scheduler-jobs: fix deploy raven and xclim testdata missing logs, forgot delayed eval ## CI Operations <!-- The test suite can be run using a different DACCS config with ``birdhouse_daccs_configs_branch: branch_name`` in the PR description. To globally skip the test suite regardless of the commit message use ``birdhouse_skip_ci`` set to ``true`` in the PR description. Using ``[<cmd>]`` (with the brackets) where ``<cmd> = skip ci`` in the commit message will override ``birdhouse_skip_ci`` from the PR description. Such commit command can be used to override the PR description behavior for a specific commit update. However, a commit message cannot 'force run' a PR which the description turns off the CI. To run the CI, the PR should instead be updated with a ``true`` value, and a running message can be posted in following PR comments to trigger tests once again. --> birdhouse_daccs_configs_branch: master birdhouse_skip_ci: false
2 parents 9499307 + 8063335 commit e56c9bb

File tree

12 files changed

+34
-18
lines changed

12 files changed

+34
-18
lines changed

‎.bumpversion.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tool.bumpversion]
2-
current_version = "2.18.8"
2+
current_version = "2.18.9"
33
commit = true
44
tag = false
55
tag_name = "{new_version}"

‎CHANGES.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
[Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
1616
------------------------------------------------------------------------------------------------------------------
1717

18+
[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
19+
20+
[2.18.9](https://github.com/bird-house/birdhouse-deploy/tree/2.18.9) (2025-11-10)
21+
------------------------------------------------------------------------------------------------------------------
22+
1823
## Changes
1924

2025
- Centralize management of `docker-compose` image version needed by `birdhouse-compose.sh` script.
@@ -41,10 +46,16 @@
4146
* `DOCKER_CLI_DOCKER`
4247
* `DOCKER_CLI_VERSION`
4348

49+
- scheduler-job-autodeploy: make compatible with change of `BIRDHOUSE_LOCAL_ENV` via env var and not symlink
50+
51+
See https://github.com/bird-house/birdhouse-deploy/pull/597#issuecomment-3428179549.
52+
4453
## Fixes
4554

4655
- `scheduler-job-deploy_xclim_testdata` wrongly used variables from `scheduler-job-deploy_raven_testdata`.
4756

57+
- scheduler-jobs: fix deploy raven and xclim testdata missing logs, forgot delayed eval
58+
4859

4960
[2.18.8](https://github.com/bird-house/birdhouse-deploy/tree/2.18.8) (2025-10-30)
5061
------------------------------------------------------------------------------------------------------------------

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ override BIRDHOUSE_MAKE_DIR := $(shell realpath -P $$(dirname $(BIRDHOUSE_MAKE_C
88
# Generic variables
99
override SHELL := bash
1010
override APP_NAME := birdhouse-deploy
11-
override APP_VERSION := 2.18.8
11+
override APP_VERSION := 2.18.9
1212

1313
# utility to remove comments after value of an option variable
1414
override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

‎README.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ for a full-fledged production platform.
1818
* - citation
1919
- | |citation|
2020

21-
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.18.8.svg
21+
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.18.9.svg
2222
:alt: Commits since latest release
23-
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.18.8...master
23+
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.18.9...master
2424

25-
.. |latest-version| image:: https://img.shields.io/badge/tag-2.18.8-blue.svg?style=flat
25+
.. |latest-version| image:: https://img.shields.io/badge/tag-2.18.9-blue.svg?style=flat
2626
:alt: Latest Tag
27-
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.18.8
27+
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.18.9
2828

2929
.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
3030
:alt: ReadTheDocs Build Status (latest version)

‎RELEASE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.18.8 2025-10-30T19:03:01Z
1+
2.18.9 2025-11-10T17:14:06Z

‎birdhouse/components/canarie-api/docker_configuration.py.template‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ SERVICES = {
108108
# NOTE:
109109
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
110110
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
111-
'version': '2.18.8',
112-
'releaseTime': '2025-10-30T19:03:01Z',
111+
'version': '2.18.9',
112+
'releaseTime': '2025-11-10T17:14:06Z',
113113
'institution': '${BIRDHOUSE_INSTITUTION}',
114114
'researchSubject': '${BIRDHOUSE_SUBJECT}',
115115
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',
@@ -141,8 +141,8 @@ PLATFORMS = {
141141
# NOTE:
142142
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
143143
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
144-
'version': '2.18.8',
145-
'releaseTime': '2025-10-30T19:03:01Z',
144+
'version': '2.18.9',
145+
'releaseTime': '2025-11-10T17:14:06Z',
146146
'institution': '${BIRDHOUSE_INSTITUTION}',
147147
'researchSubject': '${BIRDHOUSE_SUBJECT}',
148148
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

‎birdhouse/default.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ VARS='
5656
$BIRDHOUSE_DATA_PERSIST_ROOT
5757
$BIRDHOUSE_DATA_PERSIST_SHARED_ROOT
5858
$BIRDHOUSE_LOCAL_ENV
59+
$BIRDHOUSE_LOCAL_ENV_REAL_PATH
5960
$BIRDHOUSE_LOG_DIR
6061
$COMPOSE_DIR
6162
$COMPOSE_PROJECT_NAME

‎birdhouse/optional-components/scheduler-job-autodeploy/config.yml.template‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
--volume ${COMPOSE_DIR}/..:${COMPOSE_DIR}/..:rw
1010
--volume ${BIRDHOUSE_AUTODEPLOY_DEPLOY_KEY_ROOT_DIR}:${BIRDHOUSE_AUTODEPLOY_DEPLOY_KEY_ROOT_DIR}:ro
1111
--volume ${BIRDHOUSE_SSL_CERTIFICATE}:${BIRDHOUSE_SSL_CERTIFICATE}:ro
12+
--volume ${BIRDHOUSE_LOCAL_ENV_REAL_PATH}:/tmp/birdhouse-local-env
1213
--env COMPOSE_DIR=${COMPOSE_DIR}
1314
--env BIRDHOUSE_AUTODEPLOY_DEPLOY_KEY_ROOT_DIR=${BIRDHOUSE_AUTODEPLOY_DEPLOY_KEY_ROOT_DIR}
1415
--env CODE_OWNERSHIP=${BIRDHOUSE_AUTODEPLOY_CODE_OWNERSHIP}
15-
--env BIRDHOUSE_LOCAL_ENV=${BIRDHOUSE_LOCAL_ENV}
16+
--env BIRDHOUSE_LOCAL_ENV=/tmp/birdhouse-local-env
1617
--env BIRDHOUSE_COMPOSE=${BIRDHOUSE_COMPOSE}
1718
--env BIRDHOUSE_LOG_DIR=${BIRDHOUSE_LOG_DIR}
1819
--env AUTODEPLOY_SILENT=true

‎birdhouse/optional-components/scheduler-job-deploy_raven_testdata/default.env‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export SCHEDULER_JOB_RAVEN_DEPLOY_DATA_JOB_CHECKOUT_CACHE='${BIRDHOUSE_DATA_PERSIST_ROOT}/deploy_data_cache/deploy_raven_testdata_to_thredds'
2-
export SCHEDULER_JOB_RAVEN_DEPLOY_DATA_JOB_LOG_FILENAME='deploy_raven_testdata_to_thredds.log'
2+
export SCHEDULER_JOB_RAVEN_DEPLOY_DATA_JOB_LOG_FILENAME='${BIRDHOUSE_LOG_DIR}/deploy_raven_testdata_to_thredds.log'
33
export SCHEDULER_JOB_RAVEN_DEPLOY_DATA_JOB_SCHEDULE="*/30 * * * *" # UTC
44

55

@@ -16,6 +16,7 @@ DELAYED_EVAL="
1616
SCHEDULER_JOB_RAVEN_DEPLOY_DATA_JOB_DOCKER
1717
SCHEDULER_JOB_RAVEN_DEPLOY_DATA_JOB_VERSION
1818
SCHEDULER_JOB_RAVEN_DEPLOY_DATA_JOB_IMAGE
19+
SCHEDULER_JOB_RAVEN_DEPLOY_DATA_JOB_LOG_FILENAME
1920
"
2021

2122
VARS="

‎birdhouse/optional-components/scheduler-job-deploy_xclim_testdata/default.env‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export SCHEDULER_JOB_XCLIM_DEPLOY_DATA_JOB_CHECKOUT_CACHE='${BIRDHOUSE_DATA_PERSIST_ROOT}/deploy_data_cache/deploy_xclim_testdata_to_thredds'
2-
export SCHEDULER_JOB_XCLIM_DEPLOY_DATA_JOB_LOG_FILENAME='deploy_xclim_testdata_to_thredds.log'
2+
export SCHEDULER_JOB_XCLIM_DEPLOY_DATA_JOB_LOG_FILENAME='${BIRDHOUSE_LOG_DIR}/deploy_xclim_testdata_to_thredds.log'
33
export SCHEDULER_JOB_XCLIM_DEPLOY_DATA_JOB_SCHEDULE="7,37 * * * *" # UTC
44

55
export SCHEDULER_JOB_XCLIM_DEPLOY_DATA_JOB_DOCKER='${DOCKER_CLI_DOCKER}'
@@ -15,6 +15,7 @@ DELAYED_EVAL="
1515
SCHEDULER_JOB_XCLIM_DEPLOY_DATA_JOB_DOCKER
1616
SCHEDULER_JOB_XCLIM_DEPLOY_DATA_JOB_VERSION
1717
SCHEDULER_JOB_XCLIM_DEPLOY_DATA_JOB_IMAGE
18+
SCHEDULER_JOB_XCLIM_DEPLOY_DATA_JOB_LOG_FILENAME
1819
"
1920

2021
VARS="

0 commit comments

Comments
 (0)