From 94124d7b53ed27e180b75c81d737f8460b826a4f Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Sun, 28 Jan 2024 11:16:22 +0000 Subject: [PATCH] remove redundant files --- ci_test/config/README.md | 6 --- ci_test/config/st.cmd | 6 --- ci_test/values.yaml | 1 - demo.md | 90 ---------------------------------------- xml/BL46P-EA-IOC-01.xml | 24 ----------- xml/BL46P-MO-IOC-01.xml | 13 ------ 6 files changed, 140 deletions(-) delete mode 100644 ci_test/config/README.md delete mode 100644 ci_test/config/st.cmd delete mode 100644 ci_test/values.yaml delete mode 100644 demo.md delete mode 100644 xml/BL46P-EA-IOC-01.xml delete mode 100644 xml/BL46P-MO-IOC-01.xml diff --git a/ci_test/config/README.md b/ci_test/config/README.md deleted file mode 100644 index 32919be..0000000 --- a/ci_test/config/README.md +++ /dev/null @@ -1,6 +0,0 @@ -Test configuration -================== - -This folder containers a minimal configuration to be applied to each IOC -in the list of IOC instances. The CI for the domain simply loads each IOC -instance with this configuration and checks that the IOC runs. \ No newline at end of file diff --git a/ci_test/config/st.cmd b/ci_test/config/st.cmd deleted file mode 100644 index 6d2b11e..0000000 --- a/ci_test/config/st.cmd +++ /dev/null @@ -1,6 +0,0 @@ -# EPICS IOC Startup SCript -cd "/epics/ioc" - -epicsEnvSet EPICS_CA_MAX_ARRAY_BYTES 6000000 - -iocInit diff --git a/ci_test/values.yaml b/ci_test/values.yaml deleted file mode 100644 index 161231d..0000000 --- a/ci_test/values.yaml +++ /dev/null @@ -1 +0,0 @@ -image: ghcr.io/epics-containers/ioc-adsimdetector-linux-runtime:2023.10.5 \ No newline at end of file diff --git a/demo.md b/demo.md deleted file mode 100644 index ed95253..0000000 --- a/demo.md +++ /dev/null @@ -1,90 +0,0 @@ -Setup -===== - -- Use a linux desktop on the controls dev network. -- log into the K8S dashboard at https://pollux-dashboard.diamond.ac.uk -- open pods in namespace p47-iocs -- make sure there are 4 iocs and a opi pod running -- clone the bl47p repo git@github.com:epics-containers/bl47p.git -- have a terminal open with - - source /dls_sw/work/python3/ec-venv/bin/activate - - cd bl47p - - source environment.sh -- get the P47 edm gui up with **super** p47 -- make sure bl47p-ea-dcam-01 is deployed with a beta tag and that the PVA plugin is missing. When you deploy a tagged version - make sure it is 2024.1.5 which also has PVA missing - - -Intro -===== - -So, a few of us have been working on containersing EPICS IOCS and managing them -in Kubernetes for a while. Today I'm going to show you what working with your -beamline IOCs might look like in this new world. - -This is going to be a live demo!! - -We will be looking at the training rig beamline P47. -This beamline is running all its IOCs in Kubernetes, it has a pmac clipper, two -motors, two GigE cameras and a Panda Box. - - -Steps -===== - -- ec --help -- ec ioc --help -- ec ps -- **you can learn about the underlying commands that ec is using with -v** -- ec -v ps -- **which beamline am I talking to?** -- ec env -- **show the iocs in the repo* -- ec ioc list -- **oh no we have a beta dcam-01 !** -- ec ioc instances bl47p-ea-dcam-01 - - **show tab completion for above** -- ec ioc deploy bl47p-ea-dcam-01 2024.1.5 - - **show tab completion for above** -*********************************************** -- **SHOW DASHBOARD - DISCUSS Generic images and SHOW CONFIG MAPS** -*********************************************** -- **try to demo PVA viewer but the plugin is missing from the IOC !** -- LIVE CODING -- **edit iocs/bl47p-ea-dcam-01/config/bl47p-ea-dcam-01.yaml on the fly and add PVA plugin - showing schema auto completion** - - R: ":TX:" - - PVNAME: BL47P-EA-DET-01:TX:PVA -- **also describe the beamline repo as you go** -- ec deploy-local iocs/bl47p-ea-dcam-01 -- c2dv --pv BL47P-EA-DET-01:TX:PVA & - - **show the image and some movement** -- **now we have a working version we should release it** -- git add . -- git commit -m'fixed PVA in dcam 01' -- git push -- git tag -- git tag 2024.1.next-number -- ec ioc deploy bl47p-ea-dcam-01 2024.1.next-number -- ec ps -- **show that PVA is there in this version** -*********************************************** -**show that Dashboard is registering the new version** -*********************************************** -- **note that no code changes or recompilation happened to make this work** - -Now show the Panda GUI -====================== - -Show the service and the bob files. -Keep the sample cam running - -- phoebus.sh -resource http://172.23.168.180/bl47p-ea-panda-01/index.bob -- Go to TTLOUT2 and set it to ZERO to "close" the "Shutter" -- See the light go out on the Sample Cam - -Documentation -============= - -To find out more google "epics containers". Choose the documentation link. -For a quick overview of more detail see the Oxfordshire epics meeting presentation -linked in Materials. -For loads of detail head over to the Tutorials pages. diff --git a/xml/BL46P-EA-IOC-01.xml b/xml/BL46P-EA-IOC-01.xml deleted file mode 100644 index 47fec46..0000000 --- a/xml/BL46P-EA-IOC-01.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/xml/BL46P-MO-IOC-01.xml b/xml/BL46P-MO-IOC-01.xml deleted file mode 100644 index 9679f64..0000000 --- a/xml/BL46P-MO-IOC-01.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - -