rtems-proxy 0.6.1__tar.gz → 0.6.3__tar.gz

{rtems_proxy-0.6.1 → rtems_proxy-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rtems-proxy
-Version: 0.6.1
+Version: 0.6.3
 Summary: Support for a K8S proxy container in controlling and monitoring RTEMS EPICS IOCs
 Author-email: Giles Knap <giles.knap@diamond.ac.uk>
 License:                                  Apache License

{rtems_proxy-0.6.1 → rtems_proxy-0.6.3}/src/rtems_proxy/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.6.1'
-__version_tuple__ = version_tuple = (0, 6, 1)
+__version__ = version = '0.6.3'
+__version_tuple__ = version_tuple = (0, 6, 3)

{rtems_proxy-0.6.1 → rtems_proxy-0.6.3}/src/rtems_proxy/copy.py

@@ -41,6 +41,11 @@ def copy_rtems():
         dest = protocol_folder / proto_file.name
         shutil.copy(proto_file, dest)
 
+    # make sure all files are writable - by default some products are read-only
+    for folder in [dest_ioc, dest_runtime]:
+        for file in folder.glob("**/*"):
+            file.chmod(0o666)
+
     # copy all the files needed for runtime into the PVC that is being shared
     # over nfs/tftp by the nfsv2-tftp service
     for folder in ["bin", "dbd"]:
@@ -53,9 +58,4 @@ def copy_rtems():
     startup = dest_runtime / "st.cmd"
     cmd_txt = startup.read_text()
     cmd_txt = re.sub("/epics/", f"{str(nfs_root)}/", cmd_txt)
-    # also fix up the protocol path to point to protocol_folder
-    cmd_txt = (
-        cmd_txt
-        + f'\nepicsEnvSet("STREAM_PROTOCOL_PATH", "{str(nfs_root / "runtime" / "protocol")}")\n'
-    )
     startup.write_text(cmd_txt)

{rtems_proxy-0.6.1 → rtems_proxy-0.6.3}/src/rtems_proxy/rsync.sh.jinja

@@ -43,8 +43,16 @@ echo "
 
 while true; do
   inotifywait -e modify,create,delete,move -r $RTEMS_TFTP_PATH
-  rsync -rt --delete /$RTEMS_TFTP_PATH/ \
-        "rsync://$RTEMS_TFTP_IP:12002/files/$IOC_NAME/"
+  echo 'rsyncing files to server'
+  date
+  for i in 1 2 3 ; do
+    # repeat because inotify fires on the first change of several
+    # don't copy the huge ioc binary file with symbols
+    rsync -rim --exclude bin/RTEMS-beatnik/ioc --delete /$RTEMS_TFTP_PATH/ \
+          "rsync://$RTEMS_TFTP_IP:12002/files/$IOC_NAME/"
+    sleep 1
+  done
+  echo 'rsync complete'
 done
 " > /tmp/rsync-background.sh
 chmod +x /tmp/rsync-background.sh

{rtems_proxy-0.6.1 → rtems_proxy-0.6.3}/src/rtems_proxy/telnet.py

@@ -156,8 +156,6 @@ class TelnetRTEMS:
                 self.reboot(RtemsState.IOC)
                 self._child.expect(self.IOC_STARTED, timeout=50)
 
-        report("press enter for IOC shell prompt")
-
     def get_boot_prompt(self):
         """
         Get to the bootloader prompt, if the IOC shell is running then exit

{rtems_proxy-0.6.1 → rtems_proxy-0.6.3}/src/rtems_proxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rtems-proxy
-Version: 0.6.1
+Version: 0.6.3
 Summary: Support for a K8S proxy container in controlling and monitoring RTEMS EPICS IOCs
 Author-email: Giles Knap <giles.knap@diamond.ac.uk>
 License:                                  Apache License