Add deployed version for services (#62)

Add deployed version for services

---------

Co-authored-by: Benjamin Labrecque
Reviewed-on: #62

.gitea/scripts/deploy-service.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 # Deploys a service to /sls/bd/hla and (re)starts its systemd unit.
 #
-# Usage: ./.gitea/scripts/deploy-and-restart-service.sh <service-name> <dev|prod>
+# Usage: ./.gitea/scripts/deploy-service.sh <service-name> <dev|prod> [restart]
 
 source "$(dirname "$0")/common.sh"
 init_service_env "${1:-}" "${2:-}"
+DO_RESTART_SERVICE=$3
+
+NOW=$(date +%Y-%m-%dT%H:%M:%S%Z)
 
 echo "=========================================="
 echo "Deploying service: $SERVICE_NAME_LOWER (${AGEBD_ENV})"
@@ -56,7 +59,14 @@ 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}"
+VERSION_DEPLOYED_PV="AGEBD-ALH${AGEBD_ENV_SUFFIX_UPPER}:${SERVICE_NAME_UPPER}-VERSION-DEPLOYED"
+echo "Putting ${NOW} in ${VERSION_DEPLOYED_PV}"
+caput "${VERSION_DEPLOYED_PV}" "${NOW}"
+
+if [ "$DO_RESTART_SERVICE" ]; then
+    echo "Enabling and restarting systemd service ${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}"
+fi

.gitea/workflows/add-new-service.yml

@@ -35,7 +35,7 @@ jobs:
       # has to be deployed before its ioc is installed.
       - 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 Master IOC
         run: |
@@ -48,7 +48,7 @@ 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
 
       - name: Install New IOC
         run: |

.gitea/workflows/deploy.yml

@@ -175,5 +175,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

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
-

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")
-}
+}