Update panda to 0.9.0 and Aravis bug fix (#28)

* fix spurious space in dls-aravis ioc name * change pvcs prefix with hack of ioc-group * added i22 plans * update panda to latest version --------- Co-authored-by: Giles Knap <[email protected]>
epics-containers · Aug 22, 2024 · 8abb551 · 8abb551
1 parent bf57cc8
commit 8abb551
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/services/bl45p-mo-panda-01/values.yaml b/services/bl45p-mo-panda-01/values.yaml
@@ -2,7 +2,7 @@
 
 # latest container image for GigE cameras from the GitHub Container Registry
 ioc-instance:
-  image: ghcr.io/pandablocks/pandablocks-ioc:0.7.1
+  image: ghcr.io/pandablocks/pandablocks-ioc:0.9.0
 
   # this causes our config folder's start.sh to be mounted over the default
   # /epics/ioc/start.sh - thus making the pandaBlocks container image have

diff --git a/services/bl45p-mo-panda-02/values.yaml b/services/bl45p-mo-panda-02/values.yaml
@@ -2,7 +2,7 @@
 
 # latest container image for GigE cameras from the GitHub Container Registry
 ioc-instance:
-  image: ghcr.io/pandablocks/pandablocks-ioc:0.7.1
+  image: ghcr.io/pandablocks/pandablocks-ioc:0.9.0
 
   # this causes our config folder's start.sh to be mounted over the default
   # /epics/ioc/start.sh - thus making the pandaBlocks container image have

diff --git a/services/daq-blueapi/values.yaml b/services/daq-blueapi/values.yaml
@@ -34,6 +34,8 @@ blueapi:
       sources:
       - kind: dodal
         module: dodal.beamlines.p45
+      - kind: planFunctions
+        module: i22_bluesky.plans
         # TODO: Make p45 plans repository
       - kind: planFunctions
         module: dls_bluesky_core.plans

diff --git a/services/dls-aravis/config/ioc.yaml b/services/dls-aravis/config/ioc.yaml
@@ -1,8 +1,8 @@
 # yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2024.1.2/ibek.ioc.schema.json
 
-ioc_name: " [[ _global.get_env('IOC_NAME') ]]"
+ioc_name: "[[ _global.get_env('IOC_NAME') ]]"
 
-description: auto-generated by https://github.com/epics-containers/builder2ibek
+description: shared template for all Aravis cameras on p45
 
 entities:
   - type: epics.EpicsCaMaxArrayBytes
@@ -14,6 +14,7 @@ entities:
 
   - type: devIocStats.iocAdminSoft
     IOC: "[[ ioc_name | upper ]]"
+
   - type: ADAravis.aravisCamera
     CLASS: {{ .Values.CLASS}}
     ID: {{ .Values.ID }}