ood_core 0.27.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6aafe5b9d84b0b825241691c28be26cbce7402534e0ac1555a033191d13a7a1a
-  data.tar.gz: f214cbaf84997e4c27dc184f3b3a12cfc82e510c5d6eb7b9ccdfb5df0b164089
+  metadata.gz: c4cf552caaaedcb74de1091d8e9d1503b21f140b961ea8ccc3e53c1a25fa88f9
+  data.tar.gz: e69ec942c413e569d232ed8e88ee9a0abb79d5f3e9c7bf2d17cce7d3fe92b465
 SHA512:
-  metadata.gz: d1cc480563eaffcafeaf68b09ec55e5cec02d2c610b7264e45c0c0f0d830ac11e62a9b91fe395a00140c38b8bc5b01390e52d4dc8d962579fee0cf7ff33c6fc3
-  data.tar.gz: 68d5c95f5a4d87ab89cd5938d92c2d186398701942fd8a460409e5f5864b9eccedcb8ac8668d211dc0318886e6978aa0528371ede004466f0b9dcf7bc2a95118
+  metadata.gz: 72e629a77d117b4c370947e72eddc96ebddf766eff5d0459c5291074ab22033ded29e032563e00112051d0ef122e36bf4beca3e81ff94d9f5e9cd5c6576939a8
+  data.tar.gz: 61a4b4d3208796c7b4e365307fd527b081e5eb1be3fbebe02272883a3b7efafbb45c31234300dbe517f2eadc576b3cb4dc11fd91615f706704396541984c91bd

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

@@ -372,10 +372,14 @@ module OodCore
                                        hsh[:AllowAccounts].to_s.split(',')
                                      end
 
-
               hsh[:deny_accounts] = hsh[:DenyAccounts].nil? ? [] : hsh[:DenyAccounts].to_s.split(',')
-              hsh[:tres] = hsh[:TRES].nil? ? {} : hsh[:TRES].to_s.split(',').map { |str| str.split('=') }.to_h
 
+              hsh[:tres] = case hsh[:TRES]
+                           when nil, '(null)', ''
+                             {}
+                           else
+                             hsh[:TRES].to_s.split(',').map { |str| str.split('=') }.to_h
+                           end
               OodCore::Job::QueueInfo.new(**hsh)
             end
 

data/lib/ood_core/job/adapters/systemd/launcher.rb

@@ -10,7 +10,7 @@ require 'time'
 # @api private
 class OodCore::Job::Adapters::LinuxSystemd::Launcher
   attr_reader :debug, :site_timeout, :session_name_label, :ssh_hosts,
-    :strict_host_checking, :username
+    :strict_host_checking, :username, :ssh_keyfile
   # The root exception class that all LinuxSystemd adapter-specific exceptions inherit
   # from
   class Error < StandardError; end
@@ -26,6 +26,7 @@ class OodCore::Job::Adapters::LinuxSystemd::Launcher
     ssh_hosts:,
     strict_host_checking: false,
     submit_host:,
+    ssh_keyfile: "",
     **_
   )
     @debug = !! debug
@@ -35,6 +36,7 @@ class OodCore::Job::Adapters::LinuxSystemd::Launcher
     @strict_host_checking = strict_host_checking
     @submit_host = submit_host
     @username = Etc.getlogin
+    @ssh_keyfile = ssh_keyfile
   end
 
   # @param hostname [#to_s] The hostname to submit the work to
@@ -97,27 +99,27 @@ class OodCore::Job::Adapters::LinuxSystemd::Launcher
   # if ! strict_host_checking
   # -o UserKnownHostsFile=/dev/null (do not update the user's known hosts file)
   # -o StrictHostKeyChecking=no (do no check the user's known hosts file)
+  # if ssh_keyfile
+  # -i ssh_keyfile (Use this keyfile location)
   #
   # @param destination_host [#to_s] the destination host you wish to ssh into
   # @param cmd [Array<#to_s>] the command to be executed on the destination host
   def ssh_cmd(destination_host, cmd)
-    if strict_host_checking
-      [
-        'ssh', '-t',
-        '-p', OodCore::Job::Adapters::Helper.ssh_port,
-        '-o', 'BatchMode=yes',
-        "#{username}@#{destination_host}"
-      ].concat(cmd)
-    else
-      [
-        'ssh', '-t',
-        '-p', OodCore::Job::Adapters::Helper.ssh_port,
-        '-o', 'BatchMode=yes',
-        '-o', 'UserKnownHostsFile=/dev/null',
-        '-o', 'StrictHostKeyChecking=no',
-        "#{username}@#{destination_host}"
-      ].concat(cmd)
-    end
+
+    sshcmd = [
+      'ssh', '-t',
+      '-p', OodCore::Job::Adapters::Helper.ssh_port,
+      '-o', 'Batchmode=yes',
+    ]
+
+    sshcmd.concat([
+      '-o','StrictHostKeyChecking=no',
+      '-o','UserKnownHostsFile=/dev/null',
+    ]) unless strict_host_checking
+
+    sshcmd.concat(['-i',ssh_keyfile.to_s,]) unless ssh_keyfile.to_s.empty?
+
+    sshcmd.concat(["#{username}@#{destination_host}"]).concat(cmd)
   end
 
   def shell

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

@@ -15,6 +15,7 @@ module OodCore
       # @option config [Object] :ssh_hosts (nil) The list of permissable hosts, defaults to :submit_host
       # @option config [Object] :strict_host_checking (true) Set to false to disable strict host checking and updating the known_hosts file
       # @option config [Object] :submit_host The SSH target to connect to, may be the head of a round-robin
+      # @option config [Object] :ssh_keyfile The SSH Key file to use as identity.
       def self.build_systemd(config)
         c = config.to_h.symbolize_keys
         debug = c.fetch(:debug, false)
@@ -22,6 +23,7 @@ module OodCore
         ssh_hosts = c.fetch(:ssh_hosts, [c[:submit_host]])
         strict_host_checking = c.fetch(:strict_host_checking, true)
         submit_host = c[:submit_host]
+        ssh_keyfile = c.fetch(:ssh_keyfile, "")
 
         Adapters::LinuxSystemd.new(
           ssh_hosts: ssh_hosts,
@@ -31,6 +33,7 @@ module OodCore
             ssh_hosts: ssh_hosts,
             strict_host_checking: strict_host_checking,
             submit_host: submit_host,
+            ssh_keyfile: ssh_keyfile,
           )
         )
       end

data/lib/ood_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.27.1
 platform: ruby
 authors:
 - Eric Franz
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support