ood_core 0.24.1 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d7ae635ec6299414feac4de3589bea126a97cd427507bd99242f0bcb79553b4
-  data.tar.gz: 29855a0d0573e1d51fe6ebf7a0679c37993c608f77e45f804f6851d84160620c
+  metadata.gz: ad05a0d8cf307f0237329f0e33e8a66f809781e5b164ddf20b9f03d65078451d
+  data.tar.gz: 396dde55b4b5aaa321ccaf6fbc3cb049d01239335533c35c39ee9a11a1aa5d9b
 SHA512:
-  metadata.gz: 6b93ec8179ffca892538e5bdd8bcc1eae6adceac3a2d898079c7f8f3a60d5cd04ac64569e71ba0af2fb9ab9833a9b7f6d0c1f845cde1487eaf3d9c8f90b382d8
-  data.tar.gz: 2919276a9ade663afce93339602304f0fc727fa392d6f711f0166b82003c51e8765520603c93047919e4f1d1b81104723fd5ac05c760e891e90ab3a13a5d1c8e
+  metadata.gz: 4a1d7cb53117266c577eaa7792d867508f3e94ef78f2f9af7817882ad1f6165d5d43e8179e17163a83dd438627215700501ea75281204ee6b7d900649c77de9f
+  data.tar.gz: 4aaf01f40d43e7b496a053e2ef85548769beb169c78e954cd055659ecc08f2e8ef7221561f94a184eb986b9f13d52c2efda30ffdd07faeb697fab4d9d4411ce7

data/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+# [0.25.0] - 03-27-2024
+
+- [828](https://github.com/OSC/ood_core/pull/828) and [826](https://github.com/OSC/ood_core/pull/826)
+  add configurable heartbeats to noVNC connections.
+
+# [0.24.2] - 01-24-2024
+
+- [823](https://github.com/OSC/ood_core/pull/823) Corrected a mistake in converting duration to seconds.
+- [821](https://github.com/OSC/ood_core/pull/821) add container_start_args to pass options to the start command.
+
 ## [0.24.1] - 11-29-2023
 
 [820](https://github.com/OSC/ood_core/pull/820) Reverts [818](https://github.com/OSC/ood_core/pull/818)
@@ -524,7 +534,10 @@ Functionally the same as [0.17.3] but with some CI updates.
 ### Added
 - Initial release!
 
-[Unreleased]: https://github.com/OSC/ood_core/compare/v0.23.4...HEAD
+[Unreleased]: https://github.com/OSC/ood_core/compare/v0.24.2...HEAD
+[0.24.2]: https://github.com/OSC/ood_core/compare/v0.24.1...v0.24.2
+[0.24.1]: https://github.com/OSC/ood_core/compare/v0.24.0...v0.24.1
+[0.24.0]: https://github.com/OSC/ood_core/compare/v0.23.5...v0.24.0
 [0.23.5]: https://github.com/OSC/ood_core/compare/v0.23.4...v0.23.5
 [0.23.4]: https://github.com/OSC/ood_core/compare/v0.23.3...v0.23.4
 [0.23.3]: https://github.com/OSC/ood_core/compare/v0.23.2...v0.23.3

data/lib/ood_core/batch_connect/templates/vnc.rb

@@ -24,6 +24,9 @@ module OodCore
         # @option context [#to_s] :websockify_cmd
         #   ("${WEBSOCKIFY_CMD:-/opt/websockify/run}") the path to the
         #   websockify script (assumes you don't modify `:after_script`)
+        # @option context [#to_s] :websockify_heartbeat_seconds
+        #   ("${WEBSOCKIFY_HEARTBEAT_SECONDS:-30}") the websockify heartbeat
+        #   duration in seconds. (assumes you don't modify `:after_script`)
         # @option context [#to_s] :vnc_log ("vnc.log") path to vnc server log
         #   file (assumes you don't modify `:before_script` or `:after_script`)
         # @option context [#to_s] :vnc_passwd ("vnc.passwd") path to the file
@@ -130,7 +133,8 @@ module OodCore
           # successful connections so that the password can be reset
           def after_script
             websockify_cmd = context.fetch(:websockify_cmd, "${WEBSOCKIFY_CMD:-/opt/websockify/run}").to_s
-
+            websockify_hb = context.fetch(:websockify_heartbeat_seconds, "${WEBSOCKIFY_HEARTBEAT_SECONDS:-30}").to_s
+            
             <<-EOT.gsub(/^ {14}/, "")
               #{super}
 
@@ -139,7 +143,7 @@ module OodCore
               start_websockify() {
                 local log_file="./websockify.log"
                 # launch websockify in background and redirect all output to a file.
-                #{websockify_cmd} $1 $2 &> $log_file &
+                #{websockify_cmd} $1 --heartbeat=#{websockify_hb} $2 &> $log_file &
                 local ws_pid=$!
                 local counter=0
 

data/lib/ood_core/batch_connect/templates/vnc_container.rb

@@ -70,6 +70,8 @@ module OodCore
         #   empty string.
         # @option context [#to_s] :container_command ("singularity") the 
         #   singularity or apptainer execution command
+        # @option context [#to_a] :container_start_args ([]) Additional
+        #   arguements you wish to pass to the container start command.
         # @param instance_name (uuid) a name for the instance
         # @see Template
 
@@ -99,8 +101,8 @@ module OodCore
               export INSTANCE_NAME="#{@instance_name}"
               export instance_name="#{@instance_name}"
               echo "Starting instance..."
-              #{container_command} instance start #{container_path} #{@instance_name}
-              
+              #{container_command} instance start #{container_start_args} #{container_path} #{@instance_name}
+
               # Setup one-time use passwords and initialize the VNC password
               function change_passwd () {
                 echo "Setting VNC password..."
@@ -219,6 +221,10 @@ module OodCore
             context.fetch(:container_command, "singularity").to_s
           end
 
+          def container_start_args
+            context.fetch(:container_start_args, []).to_a.join(' ')
+          end
+
           # Arguments sent to `vncserver` command
           def vnc_args
             context.fetch(:vnc_args) do

data/lib/ood_core/job/adapters/fujitsu_tcs.rb

@@ -386,9 +386,8 @@ module OodCore
           # Convert duration to seconds
           def duration_in_seconds(time)
             return 0 if time.nil? or time == "-"
-            time, days = time.split("-").reverse
-            days.to_i * 24 * 3600 +
-              time.split(':').map { |v| v.to_i }.inject(0) { |total, v| total * 60 + v }
+            matched = time.match(/\((\d+\))/)
+            return matched ? matched[1].to_i : 0
           end
 
           # Convert seconds to duration

data/lib/ood_core/version.rb

@@ -1,4 +1,4 @@
 module OodCore
   # The current version of {OodCore}
-  VERSION = "0.24.1"
+  VERSION = "0.25.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.25.0
 platform: ruby
 authors:
 - Eric Franz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support