From 5547d4c9d3d3ac16801212b142da9d366348779e Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Mon, 3 Aug 2026 12:13:52 +0200 Subject: [PATCH] add deployed version for iocs --- ...oy-and-restart-service.sh => deploy-service.sh} | 14 ++++++++++---- .gitea/workflows/add-new-service.yml | 4 ++-- .gitea/workflows/deploy.yml | 2 +- packages/agebd/src/agebd/service/pvs.py | 1 - services/master/current/ioc/MASTER.template | 7 ++++++- 5 files changed, 19 insertions(+), 9 deletions(-) rename .gitea/scripts/{deploy-and-restart-service.sh => deploy-service.sh} (78%) diff --git a/.gitea/scripts/deploy-and-restart-service.sh b/.gitea/scripts/deploy-service.sh similarity index 78% rename from .gitea/scripts/deploy-and-restart-service.sh rename to .gitea/scripts/deploy-service.sh index 9feeed3..ebbe60d 100755 --- a/.gitea/scripts/deploy-and-restart-service.sh +++ b/.gitea/scripts/deploy-service.sh @@ -2,11 +2,13 @@ SERVICE_NAME=$1 AGEBD_ENV=$2 +DO_RESTART_SERVICE=$3 echo "==========================================" echo "Deploying service: $SERVICE_NAME (${AGEBD_ENV})" echo "==========================================" +NOW=$(date +%Y-%m-%dT%H:%M:%S%Z) SERVICE_NAME_LOWER=$(echo "$SERVICE_NAME" | tr '[:upper:]' '[:lower:]') SERVICE_NAME_UPPER=$(echo "$SERVICE_NAME" | tr '[:lower:]' '[:upper:]') SERVICE_DIR=/sls/bd/hla/${AGEBD_ENV}/services/${SERVICE_NAME_LOWER}/current @@ -35,7 +37,11 @@ fi mkdir -p ${HOME}/.config/systemd/user ln -sf "${SYSTEMD_UNIT_FILE_PATH}" "${HOME}/.config/systemd/user/${SYSTEMD_UNIT_NAME}" -export XDG_RUNTIME_DIR="/run/user/$(id -u)" -systemctl --user daemon-reload -systemctl --user enable "${SYSTEMD_UNIT_NAME}" -systemctl --user restart "${SYSTEMD_UNIT_NAME}" +caput "AGEBD-ALH:${SERVICE_NAME_UPPER}-VERSION-DEPLOYED" "${NOW}" + +if [ "$DO_RESTART_SERVICE" ]; then + export XDG_RUNTIME_DIR="/run/user/$(id -u)" + systemctl --user daemon-reload + systemctl --user enable "${SYSTEMD_UNIT_NAME}" + systemctl --user restart "${SYSTEMD_UNIT_NAME}" +fi diff --git a/.gitea/workflows/add-new-service.yml b/.gitea/workflows/add-new-service.yml index 0d465d6..428d5b5 100644 --- a/.gitea/workflows/add-new-service.yml +++ b/.gitea/workflows/add-new-service.yml @@ -37,7 +37,7 @@ jobs: - name: Deploy and Restart Master Service run: | - ./.gitea/scripts/deploy-and-restart-service.sh "master" "dev" + ./.gitea/scripts/deploy-service.sh "master" "dev" true # - name: Install New IOC @@ -46,4 +46,4 @@ jobs: - name: Deploy and Restart New Service run: | SERVICE_NAME=${{ steps.parse_branch.outputs.service_name_lower }} - ./.gitea/scripts/deploy-and-restart-service.sh "${SERVICE_NAME}" "dev" + ./.gitea/scripts/deploy-service.sh "${SERVICE_NAME}" "dev" true diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index ef7e9ff..e3e5b93 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -169,5 +169,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 - ./.gitea/scripts/deploy-and-restart-service.sh "${SERVICE}" "${AGEBD_ENV}" + ./.gitea/scripts/deploy-service.sh "${SERVICE}" "${AGEBD_ENV}" false done diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index dd098e2..ea2ac8f 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -16,4 +16,3 @@ class BasePVs: self.abort = pv_factory(f'AGEBD-MASTER:{svc}-ABORT.VAL') self.abortreq = pv_factory(f'AGEBD-MASTER:{svc}-ABORT-REQ.VAL') # fmt: on - diff --git a/services/master/current/ioc/MASTER.template b/services/master/current/ioc/MASTER.template index 2254af9..f8c1814 100644 --- a/services/master/current/ioc/MASTER.template +++ b/services/master/current/ioc/MASTER.template @@ -175,6 +175,11 @@ record(stringout, "AGEBD-ALH$(SUFFIX):$(SERVICE)-VERSION"){ field(ASG, "PROTECTED") } +record(stringout, "AGEBD-ALH$(SUFFIX):$(SERVICE)-VERSION-DEPLOYED"){ + field(DESC, "$(SERVICE) version that is deployed but not necessarily yet running") + field(ASG, "PROTECTED") +} + record(bo, "AGEBD-ALH$(SUFFIX):$(SERVICE)-ONOFF") { field(DESC, "pause/start service") field(ASG, "PROTECTED") @@ -202,4 +207,4 @@ record (bo, "AGEBD-ALH$(SUFFIX):$(SERVICE)-GUIRELOAD"){ field(ZNAM, "idle") field(ONAM, "reload") field(HIGH, "0.5") -} \ No newline at end of file +}