From fb28f15ad85699c45a2a4d28554458aa5687d580 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 14:59:28 +0200 Subject: [PATCH 01/56] feat: add services tests before deploying --- .gitea/workflows/deploy.yml | 41 ++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 42b933e..b0231a6 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -89,24 +89,45 @@ jobs: # ----------------------------------------------------------------- # Services Deployment # ----------------------------------------------------------------- - - name: Deploy Changed Services + - name: Detect Changed Services if: steps.filter.outputs.services == 'true' + id: detect-services run: | - # 1. Determine git comparison point BEFORE="${{ github.event.before }}" if [ -z "$BEFORE" ] || [ "$BEFORE" = "0000000000000000000000000000000000000000" ]; then BEFORE="HEAD~1" fi - # 2. Extract list of modified service folder names - CHANGED_SERVICES=$(git diff --name-only "$BEFORE" "${{ github.sha }}" | awk -F/ '$1=="services" && $2!="" {print $2}' | sort -u) + # Get space-separated list of changed service directory names + CHANGED_SERVICES=$(git diff --name-only "$BEFORE" "${{ github.sha }}" | awk -F/ '$1=="services" && $2!="" {print $2}' | sort -u | tr '\n' ' ') + + echo "services=$CHANGED_SERVICES" >> $GITHUB_OUTPUT + echo "Detected changed services: $CHANGED_SERVICES" - if [ -z "$CHANGED_SERVICES" ]; then - echo "No service directory changes detected in diff." - exit 0 - fi + - name: Test Changed Services + if: steps.filter.outputs.services == 'true' && steps.detect-services.outputs.services != '' + run: | + SERVICES="${{ steps.detect-services.outputs.services }}" + + for SERVICE in $SERVICES; do + SERVICE_DIR="services/$SERVICE" + if [ -d "$SERVICE_DIR/tests" ]; then + echo "==========================================" + echo "Running tests for: $SERVICE" + echo "==========================================" + + # Run pytest inside the service directory using uv + uv run --directory "$SERVICE_DIR" pytest + else + echo "No tests directory found for $SERVICE, skipping..." + fi + done - # 3. Loop through changed services and invoke deployment script - echo "$CHANGED_SERVICES" | while read -r SERVICE; do + - name: Deploy Changed Services + if: steps.filter.outputs.services == 'true' && steps.detect-services.outputs.services != '' + run: | + SERVICES="${{ steps.detect-services.outputs.services }}" + + for SERVICE in $SERVICES; do ./.gitea/scripts/deploy-and-restart-service.sh "${SERVICE}" "${AGEBD_ENV}" done -- 2.54.0 From a45a7a5c390d034983e31ed39a1ab988ac15fd93 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 15:11:15 +0200 Subject: [PATCH 02/56] feat: run services tests on package agebd change --- .gitea/workflows/deploy.yml | 53 ++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index b0231a6..7d29666 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -52,7 +52,7 @@ jobs: - name: Install Python 3.10 run: uv python install 3.10 - - name: Run tests + - name: Run core tests run: | UV_CACHE_DIR="/sls/bd/hla/.cache/uv" uv run --directory cli pytest @@ -87,25 +87,32 @@ jobs: rsync -av --delete --exclude='.nfs*' ./qt/ "${DEST_DIR}/" # ----------------------------------------------------------------- - # Services Deployment + # Services Detection, Testing, and Deployment # ----------------------------------------------------------------- - - name: Detect Changed Services - if: steps.filter.outputs.services == 'true' + - name: Detect Services to Test + # Run tests for a service if the service changed OR if core package agebd changed + if: steps.filter.outputs.services == 'true' || steps.filter.outputs.agebd == 'true' id: detect-services run: | - BEFORE="${{ github.event.before }}" - if [ -z "$BEFORE" ] || [ "$BEFORE" = "0000000000000000000000000000000000000000" ]; then - BEFORE="HEAD~1" + # If agebd changed, test ALL services to prevent breaking downstream dependencies + if [ "${{ steps.filter.outputs.agebd }}" = "true" ]; then + echo ":packages/agebd changed. Triggering tests for ALL services." + SERVICES_TO_TEST=$(ls -d services/*/ | xargs -n1 basename | tr '\n' ' ') + else + BEFORE="${{ github.event.before }}" + if [ -z "$BEFORE" ] || [ "$BEFORE" = "0000000000000000000000000000000000000000" ]; then + BEFORE="HEAD~1" + fi + + # Get space-separated list of modified service folder names + SERVICES_TO_TEST=$(git diff --name-only "$BEFORE" "${{ github.sha }}" | awk -F/ '$1=="services" && $2!="" {print $2}' | sort -u | tr '\n' ' ') fi - - # Get space-separated list of changed service directory names - CHANGED_SERVICES=$(git diff --name-only "$BEFORE" "${{ github.sha }}" | awk -F/ '$1=="services" && $2!="" {print $2}' | sort -u | tr '\n' ' ') - echo "services=$CHANGED_SERVICES" >> $GITHUB_OUTPUT - echo "Detected changed services: $CHANGED_SERVICES" + echo "services=$SERVICES_TO_TEST" >> $GITHUB_OUTPUT + echo "Services queued for testing: $SERVICES_TO_TEST" - - name: Test Changed Services - if: steps.filter.outputs.services == 'true' && steps.detect-services.outputs.services != '' + - name: Test Services + if: steps.detect-services.outputs.services != '' run: | SERVICES="${{ steps.detect-services.outputs.services }}" @@ -116,18 +123,26 @@ jobs: echo "Running tests for: $SERVICE" echo "==========================================" - # Run pytest inside the service directory using uv uv run --directory "$SERVICE_DIR" pytest else - echo "No tests directory found for $SERVICE, skipping..." + echo "Skipping $SERVICE (no tests directory found)..." fi done - name: Deploy Changed Services - if: steps.filter.outputs.services == 'true' && steps.detect-services.outputs.services != '' + # ONLY deploy services that explicitly had file changes (prevents redeploying all services if only agebd changed) + if: steps.filter.outputs.services == 'true' run: | - SERVICES="${{ steps.detect-services.outputs.services }}" + BEFORE="${{ github.event.before }}" + if [ -z "$BEFORE" ] || [ "$BEFORE" = "0000000000000000000000000000000000000000" ]; then + BEFORE="HEAD~1" + fi + + CHANGED_SERVICES=$(git diff --name-only "$BEFORE" "${{ github.sha }}" | awk -F/ '$1=="services" && $2!="" {print $2}' | sort -u) - for SERVICE in $SERVICES; do + for SERVICE in $CHANGED_SERVICES; do + echo "==========================================" + echo "Deploying service: $SERVICE (${AGEBD_ENV})" + echo "==========================================" ./.gitea/scripts/deploy-and-restart-service.sh "${SERVICE}" "${AGEBD_ENV}" done -- 2.54.0 From b4956014a61fa4e568413a19885480a7157c8c0e Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 15:12:38 +0200 Subject: [PATCH 03/56] feat: run services tests on package agebd change --- .gitea/workflows/deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 7d29666..d31ef1e 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -4,6 +4,8 @@ on: push: branches: - main + # TODO: remove + - features/add-services-tests-cicd tags: - 'prod' - 'v*' -- 2.54.0 From 9ad9d64895b90798e10c5f47f332b78922527a18 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 15:13:17 +0200 Subject: [PATCH 04/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index ce12f1a..7149aab 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 88db81f..1d75429 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 8976d38..f1335df 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 4be6b36..f8a110f 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 562c65d..f9faf67 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 34f4e6e..99ae66a 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 74b1b1b..0ef6d32 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 7a81b9d..e8d7cb1 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index cba0182..23594d8 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 41a617f..273892e 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index bae3362..7a55fc4 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 108a8ad..5c2d04c 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 9411ce4..fb8b1ac 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 4ac9a8c..471b79a 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 0796a71..e7ec972 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 6fb3e8a..ee1e3c3 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 42f00cc..7881fe5 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 26 +# TODO: remove: cicd test 27 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 54b49e3f4561489dc5458344902d2ca7de57c676 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 15:13:43 +0200 Subject: [PATCH 05/56] feat: run services tests on package agebd change --- .gitea/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index d31ef1e..e1f9f8d 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -5,7 +5,7 @@ on: branches: - main # TODO: remove - - features/add-services-tests-cicd + - feature/add-services-tests-cicd tags: - 'prod' - 'v*' -- 2.54.0 From ed95148805ee7f8013166b6c797fcd0c2084da6c Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 15:14:03 +0200 Subject: [PATCH 06/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 7149aab..9d8274c 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 1d75429..f437a19 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index f1335df..6e0a517 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index f8a110f..378e53f 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index f9faf67..dc48e8a 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 99ae66a..0dbaef1 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 0ef6d32..d74da2e 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index e8d7cb1..b235785 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 23594d8..a34000b 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 273892e..114376e 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 7a55fc4..b3a313e 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 5c2d04c..6f4e329 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index fb8b1ac..a896a6a 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 471b79a..c611dfc 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index e7ec972..60c65d4 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index ee1e3c3..66376f0 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 7881fe5..563b81b 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 27 +# TODO: remove: cicd test 28 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 62f6ba6fe0448abd3151f01f26acb7ef487b48c3 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 15:16:44 +0200 Subject: [PATCH 07/56] fix: cicd --- .gitea/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index e1f9f8d..fe0119f 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -56,7 +56,7 @@ jobs: - name: Run core tests run: | - UV_CACHE_DIR="/sls/bd/hla/.cache/uv" + export UV_CACHE_DIR="/sls/bd/hla/.cache/uv" uv run --directory cli pytest uv run --directory packages/agebd pytest uv run --directory scripts pytest -- 2.54.0 From 3d04450f0d376a2e826b1b6177bc00333ce60b44 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 15:18:01 +0200 Subject: [PATCH 08/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 9d8274c..36a1717 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index f437a19..67e6d84 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 6e0a517..45c10fd 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 378e53f..ff27a47 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index dc48e8a..e7c82d3 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 0dbaef1..79ac459 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index d74da2e..4d527a6 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index b235785..825c016 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index a34000b..8c0172c 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 114376e..5d97ee1 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index b3a313e..09e8f23 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 6f4e329..b2699f3 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index a896a6a..bec194c 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index c611dfc..f1af470 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 60c65d4..b52040c 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 66376f0..0058fa2 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 563b81b..057b44d 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 28 +# TODO: remove: cicd test 29 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 543338f98f050eb15574146fa172b4a2560fac3c Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 15:30:41 +0200 Subject: [PATCH 09/56] docs: move act runner cache --- .gitea/workflows/deploy.yml | 3 ++- docs/developer/cicd_runner.md | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index fe0119f..ce569c5 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -23,6 +23,8 @@ concurrency: env: # commit tagged ? yes->prod : no->dev AGEBD_ENV: ${{ github.ref_type == 'tag' && 'prod' || 'dev' }} + UV_CACHE_DIR: /sls/bd/hla/.cache/uv + UV_LINK_MODE: copy jobs: deploy: @@ -56,7 +58,6 @@ jobs: - name: Run core tests run: | - export UV_CACHE_DIR="/sls/bd/hla/.cache/uv" uv run --directory cli pytest uv run --directory packages/agebd pytest uv run --directory scripts pytest diff --git a/docs/developer/cicd_runner.md b/docs/developer/cicd_runner.md index a43584d..6c5581d 100644 --- a/docs/developer/cicd_runner.md +++ b/docs/developer/cicd_runner.md @@ -42,6 +42,20 @@ tar -xf node-v20.11.1-linux-x64.tar.xz --strip-components=2 -C ~/.local/bin/ nod rm node-v20.11.1-linux-x64.tar.xz ``` +Change the location of the cache: + +``` +mkdir -p /sls/bd/hla/.cache/act +``` + +and edit `/etc/act_runner/config.yaml` + +``` +cache: + enabled: true + dir: "/sls/bd/hla/.cache/act" +``` + ## Manually run the runner ```shell -- 2.54.0 From 9a36e9dc2b78fb20adee3e1dba1857b2a689b635 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 15:31:14 +0200 Subject: [PATCH 10/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 36a1717..64cb34c 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 67e6d84..f135d58 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 45c10fd..57fdf46 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index ff27a47..063f520 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index e7c82d3..e8f7167 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 79ac459..e3cd3d5 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 4d527a6..51fd57e 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 825c016..9ba8dc4 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 8c0172c..724ae2e 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 5d97ee1..1cb404f 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 09e8f23..2064a41 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index b2699f3..d00b930 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index bec194c..ae91a7b 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index f1af470..7f195fb 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index b52040c..4cf08c6 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 0058fa2..b150b44 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 057b44d..c589d9f 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 29 +# TODO: remove: cicd test 30 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 49e0eb527a817b992e22fcdc6a48f2a8b4dec907 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 15:38:10 +0200 Subject: [PATCH 11/56] chore: change runner workdir --- docs/developer/cicd_runner.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/developer/cicd_runner.md b/docs/developer/cicd_runner.md index 6c5581d..6a4910d 100644 --- a/docs/developer/cicd_runner.md +++ b/docs/developer/cicd_runner.md @@ -42,7 +42,7 @@ tar -xf node-v20.11.1-linux-x64.tar.xz --strip-components=2 -C ~/.local/bin/ nod rm node-v20.11.1-linux-x64.tar.xz ``` -Change the location of the cache: +Change the location of the working directory (uv .venvs are built here, take up lots of space) ``` mkdir -p /sls/bd/hla/.cache/act @@ -51,9 +51,10 @@ mkdir -p /sls/bd/hla/.cache/act and edit `/etc/act_runner/config.yaml` ``` -cache: - enabled: true - dir: "/sls/bd/hla/.cache/act" +host: + # The parent directory of a job's working directory. + # If it's empty, $HOME/.cache/act/ will be used. + workdir_parent: "/sls/bd/hla/.cache/act" ``` ## Manually run the runner -- 2.54.0 From d569497c0af711fedae278672597a529ecb3dd7d Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 15:38:49 +0200 Subject: [PATCH 12/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 64cb34c..c38bee8 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index f135d58..49cef8f 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 57fdf46..e4c92c2 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 063f520..9f4f6ec 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index e8f7167..9eb008b 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index e3cd3d5..59af962 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 51fd57e..82a153f 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 9ba8dc4..56a0771 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 724ae2e..dbe6a76 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 1cb404f..dd47562 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 2064a41..75fd291 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index d00b930..0ad5e34 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index ae91a7b..61f8df6 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 7f195fb..14cdd12 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 4cf08c6..8d27fd9 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index b150b44..a2bea7b 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index c589d9f..4541ce7 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 30 +# TODO: remove: cicd test 31 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From eebef09616e485114d1bbed06d1ba6c6e7a38b7c Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 15:42:24 +0200 Subject: [PATCH 13/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index c38bee8..ff5a189 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 49cef8f..4e40f56 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index e4c92c2..77177a9 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 9f4f6ec..98aea1b 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 9eb008b..542b6b6 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 59af962..a2c1251 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 82a153f..99a3efc 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 56a0771..aeac545 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index dbe6a76..c202c74 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index dd47562..8b655c2 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 75fd291..5a86c77 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 0ad5e34..ecfb16b 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 61f8df6..dc705e0 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 14cdd12..7f5c3f8 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 8d27fd9..86187d2 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index a2bea7b..51991d9 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 4541ce7..087a9c8 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 31 +# TODO: remove: cicd test 32 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 5da8397749e1cc14f1fbf4cf52dec0e316fa9bd0 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 15:57:06 +0200 Subject: [PATCH 14/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index ff5a189..b8ebdfd 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 4e40f56..37dcf03 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 77177a9..a273fec 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 98aea1b..2e7c9e8 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 542b6b6..eaae614 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index a2c1251..f8a3043 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 99a3efc..312d5a7 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index aeac545..a54bd71 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index c202c74..9cb0cea 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 8b655c2..d98f0a2 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 5a86c77..3ee0a74 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index ecfb16b..b231bf1 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index dc705e0..5ad92cf 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 7f5c3f8..d0435b1 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 86187d2..a488b9d 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 51991d9..147fc7e 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 087a9c8..404f542 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 32 +# TODO: remove: cicd test 33 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From d63b2b276eaa23f683ac9bec34d9c4184fa21348 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:05:53 +0200 Subject: [PATCH 15/56] systemd runner labels --- docs/developer/cicd_runner.md | 40 +++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/docs/developer/cicd_runner.md b/docs/developer/cicd_runner.md index 6a4910d..14ada13 100644 --- a/docs/developer/cicd_runner.md +++ b/docs/developer/cicd_runner.md @@ -22,6 +22,9 @@ cd ~/gitea-runner /usr/local/bin/act_runner register --instance https://gitea.psi.ch/ --labels hla-dev --token --no-interactive ``` +Note, if you use a systemd service with a config file as in the example below, +the labels will be read from that file. + This generates a `.runner` file. @@ -42,20 +45,6 @@ tar -xf node-v20.11.1-linux-x64.tar.xz --strip-components=2 -C ~/.local/bin/ nod rm node-v20.11.1-linux-x64.tar.xz ``` -Change the location of the working directory (uv .venvs are built here, take up lots of space) - -``` -mkdir -p /sls/bd/hla/.cache/act -``` - -and edit `/etc/act_runner/config.yaml` - -``` -host: - # The parent directory of a job's working directory. - # If it's empty, $HOME/.cache/act/ will be used. - workdir_parent: "/sls/bd/hla/.cache/act" -``` ## Manually run the runner @@ -120,6 +109,29 @@ SocketMode=0660 SocketGroup=podman ``` +Change the location of the working directory (uv .venvs are built here, take up lots of space) + +``` +mkdir -p /sls/bd/hla/.cache/act +``` + +and edit `/etc/act_runner/config.yaml` + +``` +host: + # The parent directory of a job's working directory. + # If it's empty, $HOME/.cache/act/ will be used. + workdir_parent: "/sls/bd/hla/.cache/act" +``` + +Configure the runner labels: (edit `/etc/act_runner/config.yaml`) + +``` +runner: + labels: + - "hla-dev" +``` + Enable and restart: ``` -- 2.54.0 From c72e906c9a53169d5e5b65538a162ed8b341434f Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:06:41 +0200 Subject: [PATCH 16/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index b8ebdfd..a08d867 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 37dcf03..c5d67a2 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index a273fec..3261da2 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 2e7c9e8..6fbecc4 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index eaae614..13031c5 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index f8a3043..7ea926a 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 312d5a7..150a1a9 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index a54bd71..d0bef3f 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 9cb0cea..4a03afc 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index d98f0a2..f1a3edf 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 3ee0a74..196c323 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index b231bf1..48b8c03 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 5ad92cf..3ac044f 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index d0435b1..b2de8f2 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index a488b9d..c9d9a3c 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 147fc7e..0a6a3f1 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 404f542..e728909 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 33 +# TODO: remove: cicd test 34 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 828b7fdad6f72c3b4ea7b2c2328462c3b5c5dd83 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:08:14 +0200 Subject: [PATCH 17/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index a08d867..33a1cb0 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index c5d67a2..4f84f8e 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 3261da2..5d87889 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 6fbecc4..2da8edf 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 13031c5..80347c0 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 7ea926a..3aa229f 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 150a1a9..7a08c4f 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index d0bef3f..08dcca5 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 4a03afc..e76607c 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index f1a3edf..a4f8c3e 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 196c323..b211bee 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 48b8c03..a1ffabe 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 3ac044f..c4cf42d 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index b2de8f2..d6adc30 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index c9d9a3c..1fc4344 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 0a6a3f1..2de9205 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index e728909..5b35b61 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 34 +# TODO: remove: cicd test 35 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 79bd8e96de3b231bdf606215501fcae823593809 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:11:04 +0200 Subject: [PATCH 18/56] docs --- docs/developer/cicd_runner.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/developer/cicd_runner.md b/docs/developer/cicd_runner.md index 14ada13..64476e2 100644 --- a/docs/developer/cicd_runner.md +++ b/docs/developer/cicd_runner.md @@ -112,6 +112,7 @@ SocketGroup=podman Change the location of the working directory (uv .venvs are built here, take up lots of space) ``` +sudo su svcusr-sls2hla mkdir -p /sls/bd/hla/.cache/act ``` -- 2.54.0 From 30dd8e794899a5556c590e7697adce25d8181f36 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:19:29 +0200 Subject: [PATCH 19/56] exclude dot dirs from deplyments syncs --- .gitea/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index ce569c5..fd0c074 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -71,7 +71,7 @@ jobs: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/bin run: | mkdir -p "${DEST_DIR}" - rsync -av --delete --exclude='.nfs*' ./bin/ "${DEST_DIR}/" + rsync -av --delete --exclude='.nfs*' --exclude='.*/' ./bin/ "${DEST_DIR}/" - name: Agebd - deploy if: steps.filter.outputs.agebd == 'true' @@ -79,7 +79,7 @@ jobs: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/packages/agebd run: | mkdir -p "${DEST_DIR}" - rsync -av --delete --exclude='.nfs*' ./packages/agebd/ "${DEST_DIR}/" + rsync -av --delete --exclude='.nfs*' --exclude='.*/' ./packages/agebd/ "${DEST_DIR}/" - name: Qt - deploy if: steps.filter.outputs.qt == 'true' @@ -87,7 +87,7 @@ jobs: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/qt run: | mkdir -p "${DEST_DIR}" - rsync -av --delete --exclude='.nfs*' ./qt/ "${DEST_DIR}/" + rsync -av --delete --exclude='.nfs*' --exclude='.*/' ./qt/ "${DEST_DIR}/" # ----------------------------------------------------------------- # Services Detection, Testing, and Deployment -- 2.54.0 From e16efe5605a9c596f1c9fc36d204753183d85e1e Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:19:49 +0200 Subject: [PATCH 20/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 33a1cb0..8616071 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 4f84f8e..574e4b5 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 5d87889..f1bb21a 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 2da8edf..39d1f59 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 80347c0..4acfec6 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 3aa229f..ccff9ac 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 7a08c4f..e794483 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 08dcca5..f8e9f90 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index e76607c..3260afc 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index a4f8c3e..cc8fd28 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index b211bee..a742707 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index a1ffabe..a6011d1 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index c4cf42d..7b392da 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index d6adc30..621bc7e 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 1fc4344..e2b375e 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 2de9205..f7efa40 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 5b35b61..5326d5a 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 35 +# TODO: remove: cicd test 36 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 3e23b451d8756a38f27603d8ea9bcc1492549794 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:22:06 +0200 Subject: [PATCH 21/56] standard excludes for services rsync --- .gitea/scripts/deploy-and-restart-service.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/scripts/deploy-and-restart-service.sh b/.gitea/scripts/deploy-and-restart-service.sh index 4bc01d5..32ca9bb 100755 --- a/.gitea/scripts/deploy-and-restart-service.sh +++ b/.gitea/scripts/deploy-and-restart-service.sh @@ -15,7 +15,7 @@ SYSTEMD_UNIT_FILE_PATH=${SERVICE_DIR}/systemd/${SYSTEMD_UNIT_NAME} mkdir -p ${SERVICE_DIR} -rsync -avz --delete --exclude='.venv' \ +rsync -avz --delete --exclude='.nfs*' --exclude='.*/' \ ./services/${SERVICE_NAME_LOWER}/current/ \ ${SERVICE_DIR}/ -- 2.54.0 From 82073a3e3355837a209930054b8fb41a4ba5fc37 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:34:47 +0200 Subject: [PATCH 22/56] cp -r rather than rsync --- .gitea/scripts/deploy-and-restart-service.sh | 6 ++---- .gitea/workflows/deploy.yml | 9 ++++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitea/scripts/deploy-and-restart-service.sh b/.gitea/scripts/deploy-and-restart-service.sh index 32ca9bb..c483829 100755 --- a/.gitea/scripts/deploy-and-restart-service.sh +++ b/.gitea/scripts/deploy-and-restart-service.sh @@ -13,11 +13,9 @@ SERVICE_DIR=/sls/bd/hla/${AGEBD_ENV}/services/${SERVICE_NAME_LOWER}/current SYSTEMD_UNIT_NAME=AGEBD-SERVICE-${SERVICE_NAME_UPPER}.service SYSTEMD_UNIT_FILE_PATH=${SERVICE_DIR}/systemd/${SYSTEMD_UNIT_NAME} +rm -rf "${SERVICE_DIR}" mkdir -p ${SERVICE_DIR} - -rsync -avz --delete --exclude='.nfs*' --exclude='.*/' \ - ./services/${SERVICE_NAME_LOWER}/current/ \ - ${SERVICE_DIR}/ +cp -r ./services/${SERVICE_NAME_LOWER}/current/* ${SERVICE_DIR}/ if [ -f "${SYSTEMD_UNIT_FILE_PATH}" ]; then diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index fd0c074..a0ef8d0 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -70,24 +70,27 @@ jobs: env: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/bin run: | + rm -rf "${DEST_DIR}" mkdir -p "${DEST_DIR}" - rsync -av --delete --exclude='.nfs*' --exclude='.*/' ./bin/ "${DEST_DIR}/" + cp -r ./bin/* "${DEST_DIR}/" - name: Agebd - deploy if: steps.filter.outputs.agebd == 'true' env: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/packages/agebd run: | + rm -rf "${DEST_DIR}" mkdir -p "${DEST_DIR}" - rsync -av --delete --exclude='.nfs*' --exclude='.*/' ./packages/agebd/ "${DEST_DIR}/" + cp -r ./packages/agebd/* "${DEST_DIR}/" - name: Qt - deploy if: steps.filter.outputs.qt == 'true' env: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/qt run: | + rm -rf "${DEST_DIR}" mkdir -p "${DEST_DIR}" - rsync -av --delete --exclude='.nfs*' --exclude='.*/' ./qt/ "${DEST_DIR}/" + cp -r ./qt/* "${DEST_DIR}/" # ----------------------------------------------------------------- # Services Detection, Testing, and Deployment -- 2.54.0 From 1c86888b5d2ccfde0dbc140fea27c16c7bea72e7 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:35:11 +0200 Subject: [PATCH 23/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 8616071..2dabb03 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 574e4b5..935cfd0 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index f1bb21a..e595acb 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 39d1f59..5f8b93f 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 4acfec6..3eee58a 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index ccff9ac..3831ce4 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index e794483..6797430 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index f8e9f90..34505c5 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 3260afc..7fdee27 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index cc8fd28..c933ee0 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index a742707..7cb7f2b 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index a6011d1..343b773 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 7b392da..4c7b043 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 621bc7e..896d086 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index e2b375e..536a183 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index f7efa40..cb2a3cb 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 5326d5a..d1b1e40 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 36 +# TODO: remove: cicd test 37 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From e723ce478ea2b91c3e6f15432032abd79f673430 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:41:02 +0200 Subject: [PATCH 24/56] enable uv cache --- .gitea/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index a0ef8d0..d39cef9 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -52,6 +52,7 @@ jobs: - name: Install uv uses: actions/setup-uv@v5 + enable-cache: true - name: Install Python 3.10 run: uv python install 3.10 -- 2.54.0 From a12ef5efffcde75495f154cd23696372e9f5ea5e Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:41:15 +0200 Subject: [PATCH 25/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 2dabb03..87f0ec3 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 935cfd0..32dd6ca 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index e595acb..946338c 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 5f8b93f..7489ccc 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 3eee58a..1c8ca33 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 3831ce4..bdf74f9 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 6797430..5a44fb0 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 34505c5..f448f15 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 7fdee27..eb623bc 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index c933ee0..faea596 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 7cb7f2b..46c9182 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 343b773..a5ff511 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 4c7b043..f191de9 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 896d086..7866152 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 536a183..aead9f6 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index cb2a3cb..a040172 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index d1b1e40..aca85ee 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 37 +# TODO: remove: cicd test 38 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From e2ddee1e6337d3b176bc9a0f7d6be99344c74e42 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:42:26 +0200 Subject: [PATCH 26/56] enable uv cache --- .gitea/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index d39cef9..d4ba632 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -53,6 +53,7 @@ jobs: - name: Install uv uses: actions/setup-uv@v5 enable-cache: true + cache-local-path: /sls/bd/hla/.cache/uv - name: Install Python 3.10 run: uv python install 3.10 -- 2.54.0 From d9ce3307c4e9ba7f73b2fd140920101dc52ae000 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:42:42 +0200 Subject: [PATCH 27/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 87f0ec3..abe882c 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 32dd6ca..37fe1e1 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 946338c..74d1310 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 7489ccc..5ac8c7e 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 1c8ca33..005c971 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index bdf74f9..470644c 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 5a44fb0..64b4459 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index f448f15..52e8ec7 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index eb623bc..6a4055b 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index faea596..e8ccb4d 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 46c9182..64fa0c5 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index a5ff511..720f626 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index f191de9..4527b0d 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 7866152..6858e3b 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index aead9f6..5911805 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index a040172..f42eece 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index aca85ee..b0ad699 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 38 +# TODO: remove: cicd test 39 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 0799f8c5e9dac9546fa1a0b7008a0e5907490c55 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:47:38 +0200 Subject: [PATCH 28/56] docs --- docs/developer/cicd_runner.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer/cicd_runner.md b/docs/developer/cicd_runner.md index 64476e2..b39d18d 100644 --- a/docs/developer/cicd_runner.md +++ b/docs/developer/cicd_runner.md @@ -122,7 +122,7 @@ and edit `/etc/act_runner/config.yaml` host: # The parent directory of a job's working directory. # If it's empty, $HOME/.cache/act/ will be used. - workdir_parent: "/sls/bd/hla/.cache/act" + workdir_parent: "/tmp" ``` Configure the runner labels: (edit `/etc/act_runner/config.yaml`) -- 2.54.0 From 536ddcfc22e5cf7745a54cc19b4e8932e68cba8d Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 16:47:52 +0200 Subject: [PATCH 29/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index abe882c..f673b0f 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 37fe1e1..73271eb 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 74d1310..6dbb5e4 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 5ac8c7e..83c0bf8 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 005c971..0b1d724 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 470644c..4ebe940 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 64b4459..f802565 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 52e8ec7..f969d97 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 6a4055b..8ee82f2 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index e8ccb4d..a3d8536 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 64fa0c5..ede86d7 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 720f626..276d5b9 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 4527b0d..edda2de 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 6858e3b..ed47414 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 5911805..28040d8 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index f42eece..699e69f 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index b0ad699..b099f17 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 39 +# TODO: remove: cicd test 40 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From f839dc3d9ec114990e7c9fc26532d7e5993fadcb Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 17:02:00 +0200 Subject: [PATCH 30/56] verbose uv --- .gitea/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index d4ba632..7c2bf58 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -60,9 +60,9 @@ jobs: - name: Run core tests run: | - uv run --directory cli pytest - uv run --directory packages/agebd pytest - uv run --directory scripts pytest + uv run --directory cli pytest -v + uv run --directory packages/agebd pytest -v + uv run --directory scripts pytest -v # ----------------------------------------------------------------- # Directory Deployments -- 2.54.0 From ebf1e31a5d7b42d48a2803fd83219c863cfebc4f Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Thu, 30 Jul 2026 17:02:12 +0200 Subject: [PATCH 31/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index f673b0f..19b86c3 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 73271eb..47f4f93 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 6dbb5e4..faec938 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 83c0bf8..8524d9c 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 0b1d724..6262b57 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 4ebe940..10f6ed6 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index f802565..f06eeb0 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index f969d97..192bd23 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 8ee82f2..05f40e4 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index a3d8536..abe87f2 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index ede86d7..ac33f5e 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 276d5b9..85c1a52 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index edda2de..f518792 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index ed47414..0ac053d 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 28040d8..180ee0b 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 699e69f..f8e95fb 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index b099f17..463bb74 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 40 +# TODO: remove: cicd test 41 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 8729515bece2e70d86c0b6e3336f5a001031aae9 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 09:42:03 +0200 Subject: [PATCH 32/56] check uv cache dir --- .gitea/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 7c2bf58..30dd3f8 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -60,6 +60,7 @@ jobs: - name: Run core tests run: | + echo $UV_CACHE_DIR uv run --directory cli pytest -v uv run --directory packages/agebd pytest -v uv run --directory scripts pytest -v -- 2.54.0 From 6841351c1cc3664afc68e69e99ffd2aee40ee960 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 09:42:20 +0200 Subject: [PATCH 33/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 19b86c3..5570908 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 47f4f93..795f3a4 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index faec938..32071df 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 8524d9c..624811e 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 6262b57..eaa3511 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 10f6ed6..3db731f 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index f06eeb0..602e70e 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 192bd23..27bb402 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 05f40e4..00f29b5 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index abe87f2..72f7bbe 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index ac33f5e..55a6ca3 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 85c1a52..17b4d3d 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index f518792..fbdc106 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 0ac053d..2478c89 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 180ee0b..e165da3 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index f8e95fb..043d50f 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 463bb74..cdf8c2a 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 41 +# TODO: remove: cicd test 42 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 46b4eea39e60876e287dac78c627225bfdb3f1db Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 09:46:23 +0200 Subject: [PATCH 34/56] remove uv action --- .gitea/workflows/deploy.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 30dd3f8..9849b38 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -23,8 +23,8 @@ concurrency: env: # commit tagged ? yes->prod : no->dev AGEBD_ENV: ${{ github.ref_type == 'tag' && 'prod' || 'dev' }} - UV_CACHE_DIR: /sls/bd/hla/.cache/uv - UV_LINK_MODE: copy + UV_CACHE_DIR: /home/svcusr-sls2hla/.cache/uv + UV_LINK_MODE: hardlink jobs: deploy: @@ -50,14 +50,6 @@ jobs: services: - 'services/**' - - name: Install uv - uses: actions/setup-uv@v5 - enable-cache: true - cache-local-path: /sls/bd/hla/.cache/uv - - - name: Install Python 3.10 - run: uv python install 3.10 - - name: Run core tests run: | echo $UV_CACHE_DIR -- 2.54.0 From 897283a801bfe24f144dab2a00491ceeed5dbdc1 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 09:46:35 +0200 Subject: [PATCH 35/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 5570908..35529b8 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 795f3a4..ad17629 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 32071df..8dba7ba 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 624811e..c6111af 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index eaa3511..cdd7db3 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 3db731f..7199d7f 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 602e70e..8185f46 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 27bb402..5f1d924 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 00f29b5..a897729 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 72f7bbe..38130ba 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 55a6ca3..ad39d17 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 17b4d3d..4fe2632 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index fbdc106..a40ad22 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 2478c89..0d82803 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index e165da3..60100b7 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 043d50f..c4df014 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index cdf8c2a..9b662cb 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 42 +# TODO: remove: cicd test 43 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From c9edd59e23cc69b4c92ab708677ece931420488e Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:10:03 +0200 Subject: [PATCH 36/56] change uv cache dir --- .gitea/workflows/deploy.yml | 5 ++++- docs/developer/cicd_runner.md | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 9849b38..82da27b 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -23,9 +23,12 @@ concurrency: env: # commit tagged ? yes->prod : no->dev AGEBD_ENV: ${{ github.ref_type == 'tag' && 'prod' || 'dev' }} - UV_CACHE_DIR: /home/svcusr-sls2hla/.cache/uv + UV_CACHE_DIR: /var/cache/uv UV_LINK_MODE: hardlink +# TODO: put this somewhere +# uv cache prune --max-bytes 12G + jobs: deploy: runs-on: hla-dev diff --git a/docs/developer/cicd_runner.md b/docs/developer/cicd_runner.md index b39d18d..ed081b4 100644 --- a/docs/developer/cicd_runner.md +++ b/docs/developer/cicd_runner.md @@ -109,6 +109,13 @@ SocketMode=0660 SocketGroup=podman ``` +Created uv cache dir, for `UV_CACHE_DIR`: + +``` +sudo mkdir -m 777 /var/cache/uv +``` + +TODO: this may not be necessary anymore: Change the location of the working directory (uv .venvs are built here, take up lots of space) ``` -- 2.54.0 From 8fabb907c019a88297c4409ba95f85bf82101cc3 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:10:16 +0200 Subject: [PATCH 37/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 35529b8..a524de2 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index ad17629..dc78398 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 8dba7ba..60fffe2 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index c6111af..325f4e2 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index cdd7db3..8ff7522 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 7199d7f..3e86e11 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 8185f46..774eb23 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 5f1d924..95a727d 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index a897729..69fd069 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 38130ba..ccda2c6 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index ad39d17..72ce03b 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 4fe2632..39c3da6 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index a40ad22..c154c95 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 0d82803..8ab5c3a 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 60100b7..7226dd3 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index c4df014..fb827ae 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 9b662cb..8de29ce 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 43 +# TODO: remove: cicd test 44 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 405b9b2038609e4901c279defeef15c6a865536b Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:22:26 +0200 Subject: [PATCH 38/56] change act cache and workdir --- docs/developer/cicd_runner.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/docs/developer/cicd_runner.md b/docs/developer/cicd_runner.md index ed081b4..2d0353a 100644 --- a/docs/developer/cicd_runner.md +++ b/docs/developer/cicd_runner.md @@ -115,21 +115,17 @@ Created uv cache dir, for `UV_CACHE_DIR`: sudo mkdir -m 777 /var/cache/uv ``` -TODO: this may not be necessary anymore: Change the location of the working directory (uv .venvs are built here, take up lots of space) -``` -sudo su svcusr-sls2hla -mkdir -p /sls/bd/hla/.cache/act -``` - -and edit `/etc/act_runner/config.yaml` +edit `/etc/act_runner/config.yaml` ``` +cache: + dir: "/var/lib/act_runner/cache" host: # The parent directory of a job's working directory. # If it's empty, $HOME/.cache/act/ will be used. - workdir_parent: "/tmp" + workdir_parent: "/var/lib/act_runner/work" ``` Configure the runner labels: (edit `/etc/act_runner/config.yaml`) -- 2.54.0 From b38a45159a76466c07822f6bbe869107415625fb Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:22:42 +0200 Subject: [PATCH 39/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index a524de2..d6e105e 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index dc78398..e0fa7ab 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 60fffe2..f115be1 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 325f4e2..4ca617e 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 8ff7522..f0050f0 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 3e86e11..a7c63a8 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 774eb23..418be96 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 95a727d..3e35cf8 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 69fd069..779494f 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index ccda2c6..6e3d513 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 72ce03b..0f34af6 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 39c3da6..eb0ec44 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index c154c95..5d61656 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 8ab5c3a..33f3d61 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 7226dd3..acd73fd 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index fb827ae..60daf22 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 8de29ce..0d46c49 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 44 +# TODO: remove: cicd test 45 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 490647313c50587523b4da273110682042885cfd Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:24:30 +0200 Subject: [PATCH 40/56] create act work and cache dir --- docs/developer/cicd_runner.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/developer/cicd_runner.md b/docs/developer/cicd_runner.md index 2d0353a..1efa972 100644 --- a/docs/developer/cicd_runner.md +++ b/docs/developer/cicd_runner.md @@ -115,9 +115,14 @@ Created uv cache dir, for `UV_CACHE_DIR`: sudo mkdir -m 777 /var/cache/uv ``` -Change the location of the working directory (uv .venvs are built here, take up lots of space) +Change the location of the act cache and working directory (uv .venvs are built here, take up lots of space) -edit `/etc/act_runner/config.yaml` +``` +sudo mkdir -m 777 /var/lib/act_runner/cache +sudo mkdir -m 777 /var/lib/act_runner/work +``` + +and edit `/etc/act_runner/config.yaml` ``` cache: -- 2.54.0 From fb0956c32dd902443f5a34f42e0406ede11acc50 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:24:45 +0200 Subject: [PATCH 41/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index d6e105e..c88b491 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index e0fa7ab..7157823 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index f115be1..8aa47b3 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 4ca617e..6103fd4 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index f0050f0..f853f95 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index a7c63a8..eb8d716 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 418be96..5bcae79 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 3e35cf8..fe5b195 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 779494f..03e576b 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 6e3d513..c7fce5e 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 0f34af6..b228c56 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index eb0ec44..bc47157 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 5d61656..43d2187 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 33f3d61..4c7ecf9 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index acd73fd..52fd17f 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 60daf22..d0aa8b1 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 0d46c49..ed846d9 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 45 +# TODO: remove: cicd test 46 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From adeeb48770799b1ab1d3f9943a34cb8c48fec713 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:34:38 +0200 Subject: [PATCH 42/56] don't remove dest dir on deploy --- .gitea/scripts/deploy-and-restart-service.sh | 3 ++- .gitea/workflows/deploy.yml | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitea/scripts/deploy-and-restart-service.sh b/.gitea/scripts/deploy-and-restart-service.sh index c483829..d63f079 100755 --- a/.gitea/scripts/deploy-and-restart-service.sh +++ b/.gitea/scripts/deploy-and-restart-service.sh @@ -13,7 +13,8 @@ SERVICE_DIR=/sls/bd/hla/${AGEBD_ENV}/services/${SERVICE_NAME_LOWER}/current SYSTEMD_UNIT_NAME=AGEBD-SERVICE-${SERVICE_NAME_UPPER}.service SYSTEMD_UNIT_FILE_PATH=${SERVICE_DIR}/systemd/${SYSTEMD_UNIT_NAME} -rm -rf "${SERVICE_DIR}" +# TODO: see https://gitea.psi.ch/sls/hla_framework_bd/issues/50 +# rm -rf "${SERVICE_DIR}" mkdir -p ${SERVICE_DIR} cp -r ./services/${SERVICE_NAME_LOWER}/current/* ${SERVICE_DIR}/ diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 82da27b..09d19ba 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -68,7 +68,8 @@ jobs: env: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/bin run: | - rm -rf "${DEST_DIR}" + # TODO: see https://gitea.psi.ch/sls/hla_framework_bd/issues/50 + # rm -rf "${DEST_DIR}" mkdir -p "${DEST_DIR}" cp -r ./bin/* "${DEST_DIR}/" @@ -77,7 +78,8 @@ jobs: env: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/packages/agebd run: | - rm -rf "${DEST_DIR}" + # TODO: see https://gitea.psi.ch/sls/hla_framework_bd/issues/50 + # rm -rf "${DEST_DIR}" mkdir -p "${DEST_DIR}" cp -r ./packages/agebd/* "${DEST_DIR}/" @@ -86,7 +88,8 @@ jobs: env: DEST_DIR: /sls/bd/hla/${{ env.AGEBD_ENV }}/qt run: | - rm -rf "${DEST_DIR}" + # TODO: see https://gitea.psi.ch/sls/hla_framework_bd/issues/50 + # rm -rf "${DEST_DIR}" mkdir -p "${DEST_DIR}" cp -r ./qt/* "${DEST_DIR}/" -- 2.54.0 From c64bdcb60c5d96065a3ceb2b30c5444a03e684d4 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:35:05 +0200 Subject: [PATCH 43/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index c88b491..592282a 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 7157823..be0c436 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 8aa47b3..913c807 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 6103fd4..0ebcd90 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index f853f95..ffb0081 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index eb8d716..43b6e44 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 5bcae79..77e5263 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index fe5b195..6ef2e7d 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 03e576b..3e4ae14 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index c7fce5e..5d1a9ae 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index b228c56..ff12ba1 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index bc47157..e0c1003 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 43d2187..d5ee932 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 4c7ecf9..671ff73 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 52fd17f..2053f5c 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index d0aa8b1..6867277 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index ed846d9..a855516 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 46 +# TODO: remove: cicd test 47 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From e62de0fce7080318e67cad4f3b6761179f48bb28 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:38:11 +0200 Subject: [PATCH 44/56] config uv in add service workflow --- .gitea/workflows/add-new-service.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/add-new-service.yml b/.gitea/workflows/add-new-service.yml index dc6ae77..118e903 100644 --- a/.gitea/workflows/add-new-service.yml +++ b/.gitea/workflows/add-new-service.yml @@ -5,6 +5,13 @@ on: branches: - 'feature/add-service-*' +env: + UV_CACHE_DIR: /var/cache/uv + UV_LINK_MODE: hardlink + +# TODO: put this somewhere +# uv cache prune --max-bytes 12G +# # TODO: when to deploy to prod? Manual (i.e. cli command)? jobs: deploy: @@ -14,18 +21,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Install and setup uv - uses: actions/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0 - with: - version: "latest" - enable-cache: true # Speeds up runs by caching python dependencies # TODO: does this work? - - - name: Install Python 3.10 - run: uv python install 3.10 - - - name: Run tests + - name: Run cli tests run: | - cd cli && uv run pytest + echo $UV_CACHE_DIR + uv run --directory cli pytest -v - name: Parse Service Directory Name id: parse_branch -- 2.54.0 From 23f69c73dfcc69add20ca3c02596433540bf7995 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:41:01 +0200 Subject: [PATCH 45/56] clean --- .gitea/workflows/deploy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 09d19ba..bac2431 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -4,8 +4,6 @@ on: push: branches: - main - # TODO: remove - - feature/add-services-tests-cicd tags: - 'prod' - 'v*' -- 2.54.0 From 752cacdae7a49b078b15f2628d8276b015ccf7cb Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:44:14 +0200 Subject: [PATCH 46/56] clean --- .gitea/workflows/add-new-service.yml | 3 --- .gitea/workflows/deploy.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.gitea/workflows/add-new-service.yml b/.gitea/workflows/add-new-service.yml index 118e903..e0a8e8e 100644 --- a/.gitea/workflows/add-new-service.yml +++ b/.gitea/workflows/add-new-service.yml @@ -9,9 +9,6 @@ env: UV_CACHE_DIR: /var/cache/uv UV_LINK_MODE: hardlink -# TODO: put this somewhere -# uv cache prune --max-bytes 12G -# # TODO: when to deploy to prod? Manual (i.e. cli command)? jobs: deploy: diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index bac2431..b2eebda 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -24,9 +24,6 @@ env: UV_CACHE_DIR: /var/cache/uv UV_LINK_MODE: hardlink -# TODO: put this somewhere -# uv cache prune --max-bytes 12G - jobs: deploy: runs-on: hla-dev -- 2.54.0 From 04b9864ac664350b4fcb295488e9a7cad35ea44f Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:45:16 +0200 Subject: [PATCH 47/56] clean --- .gitea/workflows/add-new-service.yml | 2 +- .gitea/workflows/deploy.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/add-new-service.yml b/.gitea/workflows/add-new-service.yml index e0a8e8e..0d465d6 100644 --- a/.gitea/workflows/add-new-service.yml +++ b/.gitea/workflows/add-new-service.yml @@ -21,7 +21,7 @@ jobs: - name: Run cli tests run: | echo $UV_CACHE_DIR - uv run --directory cli pytest -v + uv run --directory cli pytest - name: Parse Service Directory Name id: parse_branch diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index b2eebda..32e439b 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -51,9 +51,9 @@ jobs: - name: Run core tests run: | echo $UV_CACHE_DIR - uv run --directory cli pytest -v - uv run --directory packages/agebd pytest -v - uv run --directory scripts pytest -v + uv run --directory cli pytest + uv run --directory packages/agebd pytest + uv run --directory scripts pytest # ----------------------------------------------------------------- # Directory Deployments -- 2.54.0 From 4f59633b605e1fc805787dbce83b6b3ef15ab020 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:51:23 +0200 Subject: [PATCH 48/56] fix services tests --- .gitea/workflows/deploy.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 32e439b..c741a86 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -4,6 +4,8 @@ on: push: branches: - main + # TODO: remove + - feature/add-services-tests-cicd tags: - 'prod' - 'v*' @@ -119,16 +121,12 @@ jobs: SERVICES="${{ steps.detect-services.outputs.services }}" for SERVICE in $SERVICES; do - SERVICE_DIR="services/$SERVICE" - if [ -d "$SERVICE_DIR/tests" ]; then - echo "==========================================" - echo "Running tests for: $SERVICE" - echo "==========================================" - - uv run --directory "$SERVICE_DIR" pytest - else - echo "Skipping $SERVICE (no tests directory found)..." - fi + SERVICE_APP_DIR="services/$SERVICE/current/app" + echo "==========================================" + echo "Running tests for: $SERVICE_APP_DIR" + echo "==========================================" + + uv run --directory "$SERVICE_APP_DIR" pytest done - name: Deploy Changed Services @@ -143,8 +141,5 @@ jobs: CHANGED_SERVICES=$(git diff --name-only "$BEFORE" "${{ github.sha }}" | awk -F/ '$1=="services" && $2!="" {print $2}' | sort -u) for SERVICE in $CHANGED_SERVICES; do - echo "==========================================" - echo "Deploying service: $SERVICE (${AGEBD_ENV})" - echo "==========================================" ./.gitea/scripts/deploy-and-restart-service.sh "${SERVICE}" "${AGEBD_ENV}" done -- 2.54.0 From 544890ed19fa301913410c9802ab1dcd89d755bb Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:51:38 +0200 Subject: [PATCH 49/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 592282a..c047c29 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index be0c436..aae8240 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 913c807..7869254 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 0ebcd90..3e92624 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index ffb0081..78a655c 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 43b6e44..5ab53c2 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 77e5263..7389f1a 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 6ef2e7d..4d77700 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 3e4ae14..892ab6d 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 5d1a9ae..ea521f5 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index ff12ba1..67db4d3 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index e0c1003..0bf51de 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index d5ee932..ceef714 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 671ff73..0a4678c 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 2053f5c..d2bf272 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 6867277..30d0bd8 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index a855516..7f0ec4e 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 47 +# TODO: remove: cicd test 48 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From 8c75d86ed1e75398600a059c81c8c63c58bbf93d Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:53:23 +0200 Subject: [PATCH 50/56] fix services tests --- .gitea/workflows/deploy.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index c741a86..ef9b89b 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -122,11 +122,13 @@ jobs: for SERVICE in $SERVICES; do SERVICE_APP_DIR="services/$SERVICE/current/app" - echo "==========================================" - echo "Running tests for: $SERVICE_APP_DIR" - echo "==========================================" - - uv run --directory "$SERVICE_APP_DIR" pytest + if [ -d "$SERVICE_APP_DIR" ]; then + echo "==========================================" + echo "Running tests for: $SERVICE_APP_DIR" + echo "==========================================" + + uv run --directory "$SERVICE_APP_DIR" pytest + fi done - name: Deploy Changed Services -- 2.54.0 From 88a578846c59021c873098a5c0fac56b12a60936 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 10:53:36 +0200 Subject: [PATCH 51/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index c047c29..25f8a14 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index aae8240..ce74ff8 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 7869254..0ad130d 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 3e92624..e7eed70 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 78a655c..503f281 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 5ab53c2..dcbac41 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 7389f1a..cf6304c 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 4d77700..c47a5ea 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 892ab6d..655a78b 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index ea521f5..410e704 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 67db4d3..1d0f7fd 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 0bf51de..0b4a5a0 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index ceef714..61440c8 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 0a4678c..106b8fe 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index d2bf272..3c60caa 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 30d0bd8..120c49c 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 7f0ec4e..3504e90 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 48 +# TODO: remove: cicd test 49 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From f5a2a3c9f1d29545a61a2ee31311fc0f39774ae9 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 11:22:59 +0200 Subject: [PATCH 52/56] use rsync rather than copy --- .gitea/scripts/deploy-and-restart-service.sh | 13 ++++++- .gitea/workflows/deploy.yml | 40 +++++++++++++++++--- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/.gitea/scripts/deploy-and-restart-service.sh b/.gitea/scripts/deploy-and-restart-service.sh index d63f079..e48ea0f 100755 --- a/.gitea/scripts/deploy-and-restart-service.sh +++ b/.gitea/scripts/deploy-and-restart-service.sh @@ -15,8 +15,17 @@ SYSTEMD_UNIT_FILE_PATH=${SERVICE_DIR}/systemd/${SYSTEMD_UNIT_NAME} # TODO: see https://gitea.psi.ch/sls/hla_framework_bd/issues/50 # rm -rf "${SERVICE_DIR}" -mkdir -p ${SERVICE_DIR} -cp -r ./services/${SERVICE_NAME_LOWER}/current/* ${SERVICE_DIR}/ +# mkdir -p ${SERVICE_DIR} +# cp -r ./services/${SERVICE_NAME_LOWER}/current/* ${SERVICE_DIR}/ + +rsync -avz --delete \ + --exclude='.nfs*' \ + --exclude='.git/' \ + --exclude='.venv/' \ + --exclude='__pycache__/' \ + --exclude='*.pyc' \ + --exclude='.pytest_cache/' \ + "./services/${SERVICE_NAME_LOWER}/current/*" "${SERVICE_DIR}/" if [ -f "${SYSTEMD_UNIT_FILE_PATH}" ]; then diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index ef9b89b..4496f31 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -67,8 +67,18 @@ jobs: run: | # TODO: see https://gitea.psi.ch/sls/hla_framework_bd/issues/50 # rm -rf "${DEST_DIR}" - mkdir -p "${DEST_DIR}" - cp -r ./bin/* "${DEST_DIR}/" + # mkdir -p "${DEST_DIR}" + # cp -r ./bin/* "${DEST_DIR}/" + + rsync -avz --delete \ + --exclude='.nfs' \ + --exclude='.git/' \ + --exclude='.venv/' \ + --exclude='__pycache__/' \ + --exclude='*.pyc' \ + --exclude='.pytest_cache/' \ + ./bin/* "${DEST_DIR}/" + - name: Agebd - deploy if: steps.filter.outputs.agebd == 'true' @@ -77,8 +87,17 @@ jobs: run: | # TODO: see https://gitea.psi.ch/sls/hla_framework_bd/issues/50 # rm -rf "${DEST_DIR}" - mkdir -p "${DEST_DIR}" - cp -r ./packages/agebd/* "${DEST_DIR}/" + # mkdir -p "${DEST_DIR}" + # cp -r ./packages/agebd/* "${DEST_DIR}/" + + rsync -avz --delete \ + --exclude='.nfs' \ + --exclude='.git/' \ + --exclude='.venv/' \ + --exclude='__pycache__/' \ + --exclude='*.pyc' \ + --exclude='.pytest_cache/' \ + ./packages/agebd/* "${DEST_DIR}/" - name: Qt - deploy if: steps.filter.outputs.qt == 'true' @@ -87,8 +106,17 @@ jobs: run: | # TODO: see https://gitea.psi.ch/sls/hla_framework_bd/issues/50 # rm -rf "${DEST_DIR}" - mkdir -p "${DEST_DIR}" - cp -r ./qt/* "${DEST_DIR}/" + # mkdir -p "${DEST_DIR}" + # cp -r ./qt/* "${DEST_DIR}/" + + rsync -avz --delete \ + --exclude='.nfs' \ + --exclude='.git/' \ + --exclude='.venv/' \ + --exclude='__pycache__/' \ + --exclude='*.pyc' \ + --exclude='.pytest_cache/' \ + ./qt/* "${DEST_DIR}/" # ----------------------------------------------------------------- # Services Detection, Testing, and Deployment -- 2.54.0 From c93765523c54409da7786f15b6749e7f4d6da2d9 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 11:23:19 +0200 Subject: [PATCH 53/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 25f8a14..0672f16 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index ce74ff8..a5a57fb 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 0ad130d..937ccad 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index e7eed70..cf27714 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 503f281..ec293e0 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index dcbac41..d153f2a 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index cf6304c..f108bf4 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index c47a5ea..117b057 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 655a78b..463afa0 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 410e704..014b3c4 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 1d0f7fd..247f4a6 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 0b4a5a0..34f8e0c 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 61440c8..a1b4d64 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 106b8fe..bf702cc 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 3c60caa..1c53463 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 120c49c..c04dde3 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 3504e90..62e914e 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 49 +# TODO: remove: cicd test 50 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From f45c2c99de38c6068c56c5a746e1a1e96f1bdb9f Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 11:28:13 +0200 Subject: [PATCH 54/56] fix rsync --- .gitea/scripts/deploy-and-restart-service.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/scripts/deploy-and-restart-service.sh b/.gitea/scripts/deploy-and-restart-service.sh index e48ea0f..9feeed3 100755 --- a/.gitea/scripts/deploy-and-restart-service.sh +++ b/.gitea/scripts/deploy-and-restart-service.sh @@ -25,7 +25,7 @@ rsync -avz --delete \ --exclude='__pycache__/' \ --exclude='*.pyc' \ --exclude='.pytest_cache/' \ - "./services/${SERVICE_NAME_LOWER}/current/*" "${SERVICE_DIR}/" + ./services/${SERVICE_NAME_LOWER}/current/* ${SERVICE_DIR}/ if [ -f "${SYSTEMD_UNIT_FILE_PATH}" ]; then -- 2.54.0 From 9ca59b301758fb3cfe3cb9ced44b922447f8f281 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 11:28:32 +0200 Subject: [PATCH 55/56] test cicd --- bin/start_service.sh | 2 +- packages/agebd/src/agebd/service/pvs.py | 2 +- services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py | 2 +- .../injectionguard/current/app/src/agebd_injectionguard/main.py | 2 +- services/master/current/app/src/agebd_master/main.py | 2 +- services/plots/current/app/src/agebd_plots/main.py | 2 +- .../postmortemlog/current/app/src/agebd_postmortemlog/main.py | 2 +- services/scrubbing/current/app/src/agebd_scrubbing/main.py | 2 +- services/shifttool/current/app/src/agebd_shifttool/main.py | 2 +- services/taubpm/current/app/src/agebd_taubpm/main.py | 2 +- services/taupct/current/app/src/agebd_taupct/main.py | 2 +- services/timing/current/app/src/agebd_timing/main.py | 2 +- services/topuptool/current/app/src/agebd_topuptool/main.py | 2 +- services/tune/current/app/src/agebd_tune/main.py | 2 +- services/tunebump/current/app/src/agebd_tunebump/main.py | 2 +- services/tunefbx/current/app/src/agebd_tunefbx/main.py | 2 +- services/tunefby/current/app/src/agebd_tunefby/main.py | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/start_service.sh b/bin/start_service.sh index 0672f16..d5d269a 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -42,4 +42,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index a5a57fb..dd098e2 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 class BasePVs: diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 937ccad..011d64c 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index cf27714..ad8395f 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index ec293e0..44f31e9 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index d153f2a..0d1ed2f 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index f108bf4..22b0c6e 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index 117b057..2fcbe1a 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 463afa0..193909c 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 014b3c4..f7cd48f 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index 247f4a6..a05c57a 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index 34f8e0c..cda08a0 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index a1b4d64..bac7316 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index bf702cc..11d68f8 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index 1c53463..c2c4dae 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index c04dde3..5b947e6 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 62e914e..08665aa 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 50 +# TODO: remove: cicd test 51 def main( log_level: LogLevel = typer.Option( -- 2.54.0 From b677195ffc02a1d04284dea7f1a631d133b54b68 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Fri, 31 Jul 2026 11:33:53 +0200 Subject: [PATCH 56/56] clean --- .gitea/workflows/deploy.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 4496f31..ef7e9ff 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -4,8 +4,6 @@ on: push: branches: - main - # TODO: remove - - feature/add-services-tests-cicd tags: - 'prod' - 'v*' @@ -71,7 +69,7 @@ jobs: # cp -r ./bin/* "${DEST_DIR}/" rsync -avz --delete \ - --exclude='.nfs' \ + --exclude='.nfs*' \ --exclude='.git/' \ --exclude='.venv/' \ --exclude='__pycache__/' \ @@ -91,7 +89,7 @@ jobs: # cp -r ./packages/agebd/* "${DEST_DIR}/" rsync -avz --delete \ - --exclude='.nfs' \ + --exclude='.nfs*' \ --exclude='.git/' \ --exclude='.venv/' \ --exclude='__pycache__/' \ @@ -110,7 +108,7 @@ jobs: # cp -r ./qt/* "${DEST_DIR}/" rsync -avz --delete \ - --exclude='.nfs' \ + --exclude='.nfs*' \ --exclude='.git/' \ --exclude='.venv/' \ --exclude='__pycache__/' \ -- 2.54.0