ood_core 0.11.4 → 0.15.1

data/lib/ood_core/job/adapters/kubernetes/k8s_job_info.rb

@@ -0,0 +1,9 @@
+# An object that describes a submitted kubernetes job with extended information
+class OodCore::Job::Adapters::Kubernetes::K8sJobInfo < OodCore::Job::Info
+  attr_reader :ood_connection_info
+
+  def initialize(ood_connection_info: {}, **options)
+    super(options)
+    @ood_connection_info = ood_connection_info
+  end
+end

data/lib/ood_core/job/adapters/kubernetes/resources.rb

@@ -0,0 +1,58 @@
+module OodCore::Job::Adapters::Kubernetes::Resources
+
+  class ConfigMap
+    attr_accessor :name, :filename, :data
+
+    def initialize(name, filename, data)
+      @name = name
+      @filename = filename
+      @data = data
+    end
+  end
+
+  class Container
+    attr_accessor :name, :image, :command, :port, :env, :memory, :cpu, :working_dir,
+                  :restart_policy, :supplemental_groups
+
+    def initialize(
+        name, image, command: [], port: nil, env: [], memory: "4Gi", cpu: "1",
+        working_dir: "", restart_policy: "Never", supplemental_groups: []
+      )
+      raise ArgumentError, "containers need valid names and images" unless name && image
+
+      @name = name
+      @image = image
+      @command = command.nil? ? [] : command
+      @port = port&.to_i
+      @env = env.nil? ? [] : env
+      @memory = memory.nil? ? "4Gi" : memory
+      @cpu = cpu.nil? ? "1" : cpu
+      @working_dir = working_dir.nil? ? "" : working_dir
+      @restart_policy = restart_policy.nil? ? "Never" : restart_policy
+      @supplemental_groups = supplemental_groups.nil? ? [] : supplemental_groups
+    end
+
+    def ==(other)
+      name == other.name &&
+        image == other.image &&
+        command == other.command &&
+        port == other.port &&
+        env == other.env &&
+        memory == other.memory &&
+        cpu == other.cpu &&
+        working_dir == other.working_dir &&
+        restart_policy == other.restart_policy &&
+        supplemental_groups == other.supplemental_groups
+    end
+
+  end
+
+  class PodSpec
+    attr_accessor :container, :init_containers
+    def initialize(container, init_containers: nil)
+      @container = container
+      @init_containers = init_containers
+    end
+  end
+  
+end

data/lib/ood_core/job/adapters/kubernetes/templates/pod.yml.erb

@@ -0,0 +1,158 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  namespace: <%= namespace %>
+  name: <%= id %>
+  labels:
+    job: <%= id %>
+    app.kubernetes.io/name: <%= container.name %>
+    app.kubernetes.io/managed-by: open-ondemand
+    <%- if !script.accounting_id.nil? && script.accounting_id != "" -%>
+    account: <%= script.accounting_id %>
+    <%- end -%>
+  annotations:
+    <%- unless script.wall_time.nil? -%>
+    pod.kubernetes.io/lifetime: <%= helper.seconds_to_duration(script.wall_time) %>
+    <%- end -%>
+spec:
+  restartPolicy: <%= spec.container.restart_policy %>
+  securityContext:
+    runAsUser: <%= run_as_user %>
+    runAsGroup: <%= run_as_group %>
+    runAsNonRoot: true
+    <%- if spec.container.supplemental_groups.empty? -%>
+    supplementalGroups: []
+    <%- else -%>
+    supplementalGroups:
+    <%- spec.container.supplemental_groups.each do |supplemental_group| -%>
+    - "<%= supplemental_group %>"
+    <%- end -%>
+    <%- end -%>
+    fsGroup: <%= fs_group %>
+  hostNetwork: false
+  hostIPC: false
+  hostPID: false
+  containers:
+  - name: "<%= spec.container.name %>"
+    image: <%= spec.container.image %>
+    imagePullPolicy: IfNotPresent
+    <%- unless spec.container.working_dir.empty? -%>
+    workingDir: "<%= spec.container.working_dir %>"
+    <%- end -%>
+    <%- unless spec.container.env.empty? -%>
+    env:
+    <%- spec.container.env.each do |env| -%>
+    - name: <%= env[:name] %>
+      value: "<%= env[:value] %>"
+    <%- end # for each env -%>
+    <%- end # unless env is nil -%>
+    <%- unless spec.container.command.empty? -%>
+    command:
+    <%- spec.container.command.each do |cmd| -%>
+    - "<%= cmd %>"
+    <%- end # for each command -%>
+    <%- end # unless command is nil -%>
+    <%- unless spec.container.port.nil? -%>
+    ports:
+    - containerPort: <%= spec.container.port %>
+    <%- end -%>
+    volumeMounts:
+    <%- unless configmap.nil? -%>
+    - name: configmap-volume
+      mountPath:  <%= configmap_mount_path %>
+    <%- end -%>
+    <%- all_mounts.each do |mount| -%>
+    - name: <%= mount[:name] %>
+      mountPath: <%= mount[:destination_path] %>
+    <%- end # for each mount -%>
+    resources:
+      limits:
+        memory: "<%= spec.container.memory %>"
+        cpu: "<%= spec.container.cpu %>"
+      requests:
+        memory: "<%= spec.container.memory %>"
+        cpu: "<%= spec.container.cpu %>"
+    securityContext:
+      allowPrivilegeEscalation: false
+      capabilities:
+        drop:
+        - all
+      privileged: false
+  <%- unless spec.init_containers.nil? -%>
+  initContainers:
+  <%- spec.init_containers.each do |ctr| -%>
+  - name: "<%= ctr.name %>"
+    image: "<%= ctr.image %>"
+    command:
+    <%- ctr.command.each do |cmd| -%>
+    - "<%= cmd %>"
+    <%- end # command loop -%>
+    volumeMounts:
+    <%- unless configmap.nil? -%>
+    - name: configmap-volume
+      mountPath:  <%= configmap_mount_path %>
+    <%- end -%>
+    <%- all_mounts.each do |mount| -%>
+    - name: <%= mount[:name] %>
+      mountPath: <%= mount[:destination_path] %>
+    <%- end # for each mount -%>
+    securityContext:
+      allowPrivilegeEscalation: false
+      capabilities:
+        drop:
+        - all
+      privileged: false
+  <%- end # init container loop -%>
+  <%- end # if init containers -%>
+  <%- unless (configmap.to_s.empty? && all_mounts.empty?) -%>
+  volumes:
+  <%- unless configmap.to_s.empty? -%>
+  - name: configmap-volume
+    configMap:
+      name: <%= configmap_name(id) %>
+  <%- end -%>
+  <%- all_mounts.each do |mount| -%>
+  <%- if mount[:type] == 'nfs' -%>
+  - name: <%= mount[:name] %>
+    nfs:
+      server: <%= mount[:host] %>
+      path: <%= mount[:path] %>
+  <%- elsif mount[:type] == 'host' -%>
+  - name: <%= mount[:name] %>
+    hostPath:
+      path: <%= mount[:path] %>
+      type: <%= mount[:host_type] %>
+  <%- end # if mount is [host,nfs] -%>
+  <%- end # for each mount -%>
+  <%- end # (configmap.to_s.empty? || all_mounts.empty?) -%>
+---
+<%- unless spec.container.port.nil? -%>
+apiVersion: v1
+kind: Service
+metadata:
+  name: <%= service_name(id) %>
+  namespace: <%= namespace %>
+  labels:
+    job: <%= id %>
+spec:
+  selector:
+    job: <%= id %>
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: <%= spec.container.port %>
+  type: NodePort
+<%- end # end for service -%>
+---
+<%- unless configmap.nil? -%>
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: <%= configmap_name(id) %>
+  namespace: <%= namespace %>
+  labels:
+    job: <%= id %>
+data:
+  <%= configmap.filename %>: |
+    <% config_data_lines(configmap.data).each do |line| %><%= line %><% end %>
+<%- end # end for configmap -%>

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

@@ -166,7 +166,7 @@ class OodCore::Job::Adapters::LinuxHost::Launcher
         'email_on_terminated' => script_email_on_event(script, 'terminated'),
         'email_on_start' => script_email_on_event(script, 'started'),
         'environment' => export_env(script),
-        'error_path' => (script.error_path) ? script.error_path.to_s : '/dev/null',
+        'error_path' => error_path(script),
         'job_name' => script.job_name.to_s,
         'output_path' => (script.output_path) ? script.output_path.to_s : '/dev/null',
         'script_content' => content,
@@ -174,7 +174,9 @@ class OodCore::Job::Adapters::LinuxHost::Launcher
         'session_name' => session_name,
         'singularity_bin' => singularity_bin,
         'singularity_image' => singularity_image(script.native),
+        'ssh_hosts' => ssh_hosts,
         'tmux_bin' => tmux_bin,
+        'workdir' => (script.workdir) ? script.workdir.to_s : '/tmp',
       }.each{
         |key, value| bnd.local_variable_set(key, value)
       }
@@ -271,4 +273,11 @@ class OodCore::Job::Adapters::LinuxHost::Launcher
     return false if script.content.empty?
     script.content.split("\n").first.start_with?('#!/')
   end
+
+  def error_path(script)
+    return script.error_path.to_s if script.error_path
+    return script.output_path.to_s if script.output_path
+
+    '/dev/null'
+  end
 end

data/lib/ood_core/job/adapters/linux_host/templates/script_wrapper.erb.sh

@@ -1,14 +1,24 @@
 #!/bin/bash
-hostname
+SSH_HOSTS=(<%= ssh_hosts.join(' ').to_s %>)
+hostnames=`hostname -A`
+for host in ${SSH_HOSTS[@]}
+do
+    if [[ " ${hostnames[@]} " =~ " ${host} " ]]; then
+        hostname=$host
+    fi
+done
+
+if [ -z "$hostname" ]; then
+    printf >&2 "ERROR: Can't start job on [${hostnames[@]}] because it does not match any hostname configured \nin ssh_hosts [${SSH_HOSTS[@]}]. The output of 'hostname -A' must match an entry in ssh_hosts \nfrom the cluster configuration."
+    exit 1
+fi
+
+echo $hostname
 
 # Put the script into a temp file on localhost
-<% if debug %>
-singularity_tmp_file=$(mktemp -p "$HOME" --suffix '_sing')
-tmux_tmp_file=$(mktemp -p "$HOME" --suffix "_tmux")
-<% else %>
-singularity_tmp_file=$(mktemp)
-tmux_tmp_file=$(mktemp)
-<% end %>
+singularity_tmp_file=$(mktemp -p "<%= workdir %>" --suffix '_sing')
+tmux_tmp_file=$(mktemp -p "<%= workdir %>" --suffix "_tmux")
+
 
 # Create an executable to run in a tmux session
 # The escaped HEREDOC means that we need to substitute in $singularity_tmp_file ourselves
@@ -55,10 +65,3 @@ SINGULARITY_LAUNCHER
 chmod +x "$singularity_tmp_file"
 chmod +x "$tmux_tmp_file"
 <%= tmux_bin %> new-session -d -s "<%= session_name %>" "$tmux_tmp_file"
-
-# Remove the file
-<% if ! debug %>
-# Wait 1 second to ensure that tmux session has started before the file is removed
-sleep 1
-rm -f "$tmux_tmp_file"; rm -f "$singularity_tmp_file"
-<% end %>

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

@@ -14,6 +14,7 @@ module OodCore
       # @option config [#to_s] :serverdir ('') Path to lsf client etc dir
       # @option config [#to_s] :cluster ('') name of cluster, if in multi-cluster mode
       # @option config [#to_h] :bin_overrides ({}) Optional overrides to LSF client executables
+      # @option config [#to_s] :submit_host ('') Host to submit commands to
       def self.build_lsf(config)
         batch = Adapters::Lsf::Batch.new(config.to_h.symbolize_keys)
         Adapters::Lsf.new(batch: batch)

data/lib/ood_core/job/adapters/lsf/batch.rb

@@ -2,21 +2,22 @@
 #
 # @api private
 class OodCore::Job::Adapters::Lsf::Batch
-  attr_reader :bindir, :libdir, :envdir, :serverdir, :cluster, :bin_overrides
+  attr_reader :bindir, :libdir, :envdir, :serverdir, :cluster, :bin_overrides, :submit_host, :strict_host_checking
 
   # The root exception class that all LSF-specific exceptions inherit
   # from
   class Error < StandardError; end
 
   # @param bin [#to_s] path to LSF installation binaries
-  def initialize(bindir: "", envdir: "", libdir: "", serverdir: "", cluster: "", bin_overrides: {}, **_)
+  def initialize(bindir: "", envdir: "", libdir: "", serverdir: "", cluster: "", bin_overrides: {}, submit_host: "", strict_host_checking: true, **_)
     @bindir = Pathname.new(bindir.to_s)
-
     @envdir = Pathname.new(envdir.to_s)
     @libdir = Pathname.new(libdir.to_s)
     @serverdir = Pathname.new(serverdir.to_s)
     @cluster = cluster.to_s
     @bin_overrides = bin_overrides
+    @submit_host = submit_host.to_s
+    @strict_host_checking = strict_host_checking
   end
 
   def default_env
@@ -143,6 +144,7 @@ class OodCore::Job::Adapters::Lsf::Batch
       cmd = OodCore::Job::Adapters::Helper.bin_path(cmd, bindir, bin_overrides)
       args = cluster_args + args
       env = default_env.merge(env.to_h)
+      cmd, args = OodCore::Job::Adapters::Helper.ssh_wrap(submit_host, cmd, args, strict_host_checking, env)
       o, e, s = Open3.capture3(env, cmd, *(args.map(&:to_s)), stdin_data: stdin.to_s)
       s.success? ? o : raise(Error, e)
     end

data/lib/ood_core/job/adapters/lsf/helper.rb

@@ -78,40 +78,40 @@ class OodCore::Job::Adapters::Lsf::Helper
   def batch_submit_args(script, after: [], afterok: [], afternotok: [], afterany: [])
     args = []
 
-    args += ["-P", script.accounting_id] unless script.accounting_id.nil?
-    args += ["-cwd", script.workdir.to_s] unless script.workdir.nil?
-    args += ["-J", script.job_name] unless script.job_name.nil?
-    args[-1] += "[#{script.job_array_request}]" unless script.job_array_request.nil?
-
-    args += ["-q", script.queue_name] unless script.queue_name.nil?
-    args += ["-U", script.reservation_id] unless script.reservation_id.nil?
-    args += ["-sp", script.priority] unless script.priority.nil?
-    args += ["-H"] if script.submit_as_hold
-    args += (script.rerunnable ? ["-r"] : ["-rn"]) unless script.rerunnable.nil?
-    args += ["-b", script.start_time.localtime.strftime("%Y:%m:%d:%H:%M")] unless script.start_time.nil?
-    args += ["-W", (script.wall_time / 60).to_i] unless script.wall_time.nil?
-    args += ["-L", script.shell_path.to_s] unless script.shell_path.nil?
+    args.concat ["-P", script.accounting_id] unless script.accounting_id.nil?
+    args.concat ["-cwd", script.workdir.to_s] unless script.workdir.nil?
+    args.concat ["-J", script.job_name] unless script.job_name.nil?
+    args[-1].concat "[#{script.job_array_request}]" unless script.job_array_request.nil?
+
+    args.concat ["-q", script.queue_name] unless script.queue_name.nil?
+    args.concat ["-U", script.reservation_id] unless script.reservation_id.nil?
+    args.concat ["-sp", script.priority] unless script.priority.nil?
+    args.concat ["-H"] if script.submit_as_hold
+    args.concat (script.rerunnable ? ["-r"] : ["-rn"]) unless script.rerunnable.nil?
+    args.concat ["-b", script.start_time.localtime.strftime("%Y:%m:%d:%H:%M")] unless script.start_time.nil?
+    args.concat ["-W", (script.wall_time / 60).to_i] unless script.wall_time.nil?
+    args.concat ["-L", script.shell_path.to_s] unless script.shell_path.nil?
 
     # environment
     env = script.job_environment || {}
     # To preserve pre-existing behavior we only act when true or false, when nil we do nothing
     if script.copy_environment?
-      args += ["-env", (["all"] + env.keys).join(",")]
+      args.concat ["-env", (["all"] + env.keys).join(",")]
     elsif script.copy_environment? == false
-      args += ["-env", (["none"] + env.keys).join(",")]
+      args.concat ["-env", (["none"] + env.keys).join(",")]
     end
 
     # input and output files
-    args += ["-i", script.input_path] unless script.input_path.nil?
-    args += ["-o", script.output_path] unless script.output_path.nil?
-    args += ["-e", script.error_path] unless script.error_path.nil?
+    args.concat ["-i", script.input_path] unless script.input_path.nil?
+    args.concat ["-o", script.output_path] unless script.output_path.nil?
+    args.concat ["-e", script.error_path] unless script.error_path.nil?
 
     # email
-    args += ["-B"] if script.email_on_started
-    args += ["-N"] if script.email_on_terminated
-    args += ["-u", script.email.join(",")] unless script.email.nil? || script.email.empty?
+    args.concat ["-B"] if script.email_on_started
+    args.concat ["-N"] if script.email_on_terminated
+    args.concat ["-u", script.email.join(",")] unless script.email.nil? || script.email.empty?
 
-    args += script.native unless script.native.nil?
+    args.concat script.native unless script.native.nil?
 
     {args: args, env: env}
   end

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

@@ -10,17 +10,21 @@ module OodCore
       # Build the PBS Pro adapter from a configuration
       # @param config [#to_h] the configuration for job adapter
       # @option config [Object] :host (nil) The batch server host
+      # @option config [Object] :submit_host ("") The login node where the job is submitted
+      # @option config [Object] :strict_host_checking (true) Whether to use strict host checking when ssh to submit_host
       # @option config [Object] :exec (nil) Path to PBS Pro executables
       # @option config [Object] :qstat_factor (nil) Deciding factor on how to
       #   call qstat for a user
       # @option config [#to_h] :bin_overrides ({}) Optional overrides to PBS Pro client executables
       def self.build_pbspro(config)
         c = config.to_h.compact.symbolize_keys
-        host = c.fetch(:host, nil)
-        pbs_exec = c.fetch(:exec, nil)
-        qstat_factor = c.fetch(:qstat_factor, nil)
-        bin_overrides = c.fetch(:bin_overrides, {})
-        pbspro = Adapters::PBSPro::Batch.new(host: host, pbs_exec: pbs_exec, bin_overrides: bin_overrides)
+        host                 = c.fetch(:host, nil)
+        submit_host          = c.fetch(:submit_host, "")
+        strict_host_checking = c.fetch(:strict_host_checking, true)
+        pbs_exec             = c.fetch(:exec, nil)
+        qstat_factor         = c.fetch(:qstat_factor, nil)
+        bin_overrides         = c.fetch(:bin_overrides, {})
+        pbspro = Adapters::PBSPro::Batch.new(host: host, submit_host: submit_host, strict_host_checking: strict_host_checking, pbs_exec: pbs_exec, bin_overrides: bin_overrides)
         Adapters::PBSPro.new(pbspro: pbspro, qstat_factor: qstat_factor)
       end
     end
@@ -41,6 +45,18 @@ module OodCore
           # @return [String, nil] the batch server host
           attr_reader :host
 
+          # The login node to submit the job via ssh
+          # @example
+          #   my_batch.submit_host #=> "my_batch.server.edu"
+          # @return [String, nil] the login node
+          attr_reader :submit_host
+
+          # Whether to use strict host checking when ssh to submit_host
+          # @example
+          #   my_batch.strict_host_checking #=> "false"
+          # @return [Bool, true] the login node; true if not present
+          attr_reader :strict_host_checking
+
           # The path containing the PBS executables
           # @example
           #   my_batch.pbs_exec.to_s #=> "/usr/local/pbspro/10.0.0
@@ -58,11 +74,15 @@ module OodCore
           class Error < StandardError; end
 
           # @param host [#to_s, nil] the batch server host
+          # @param submit_host [#to_s, nil] the login node to ssh to
+          # @param strict_host_checking [bool, true] wheter to use strict host checking when ssh to submit_host
           # @param exec [#to_s, nil] path to pbs executables
-          def initialize(host: nil, pbs_exec: nil, bin_overrides: {})
-            @host = host && host.to_s
-            @pbs_exec = pbs_exec && Pathname.new(pbs_exec.to_s)
-            @bin_overrides = bin_overrides
+          def initialize(host: nil, submit_host: "", strict_host_checking: true, pbs_exec: nil, bin_overrides: {})
+            @host                 = host && host.to_s
+            @submit_host          = submit_host && submit_host.to_s
+            @strict_host_checking = strict_host_checking
+            @pbs_exec             = pbs_exec && Pathname.new(pbs_exec.to_s)
+            @bin_overrides        = bin_overrides
           end
 
           # Get a list of hashes detailing each of the jobs on the batch server
@@ -87,7 +107,7 @@ module OodCore
           # @return [Array<Hash>] list of details for jobs
           def get_jobs(id: "")
             args = ["-f", "-t"]   # display all information
-            args += [id.to_s] unless id.to_s.empty?
+            args.concat [id.to_s] unless id.to_s.empty?
             lines = call("qstat", *args).gsub("\n\t", "").split("\n").map(&:strip)
 
             jobs = []
@@ -159,12 +179,12 @@ module OodCore
               cmd = cmd.to_s
               bindir = (!!pbs_exec) ? pbs_exec.join("bin").to_s : ''
               cmd = OodCore::Job::Adapters::Helper.bin_path(cmd, bindir, bin_overrides)
-              args = args.map(&:to_s)
               env = env.to_h.each_with_object({}) { |(k, v), h| h[k.to_s] = v.to_s }
               env["PBS_DEFAULT"] = host.to_s if host
               env["PBS_EXEC"]    = pbs_exec.to_s if pbs_exec
+              cmd, args = OodCore::Job::Adapters::Helper.ssh_wrap(submit_host, cmd, args, strict_host_checking)
               chdir ||= "."
-              o, e, s = Open3.capture3(env, cmd, *args, stdin_data: stdin.to_s, chdir: chdir.to_s)
+              o, e, s = Open3.capture3(env, cmd, *(args.map(&:to_s)), stdin_data: stdin.to_s, chdir: chdir.to_s)
               s.success? ? o : raise(Error, e)
             end
         end
@@ -227,28 +247,28 @@ module OodCore
           # Set qsub options
           args = []
           # ignore args, can't use these if submitting from STDIN
-          args += ["-h"] if script.submit_as_hold
-          args += ["-r", script.rerunnable ? "y" : "n"] unless script.rerunnable.nil?
-          args += ["-M", script.email.join(",")] unless script.email.nil?
+          args.concat ["-h"] if script.submit_as_hold
+          args.concat ["-r", script.rerunnable ? "y" : "n"] unless script.rerunnable.nil?
+          args.concat ["-M", script.email.join(",")] unless script.email.nil?
           if script.email_on_started && script.email_on_terminated
-            args += ["-m", "be"]
+            args.concat ["-m", "be"]
           elsif script.email_on_started
-            args += ["-m", "b"]
+            args.concat ["-m", "b"]
           elsif script.email_on_terminated
-            args += ["-m", "e"]
+            args.concat ["-m", "e"]
           end
-          args += ["-N", script.job_name] unless script.job_name.nil?
-          args += ["-S", script.shell_path] unless script.shell_path.nil?
+          args.concat ["-N", script.job_name] unless script.job_name.nil?
+          args.concat ["-S", script.shell_path] unless script.shell_path.nil?
           # ignore input_path (not defined in PBS Pro)
-          args += ["-o", script.output_path] unless script.output_path.nil?
-          args += ["-e", script.error_path] unless script.error_path.nil?
+          args.concat ["-o", script.output_path] unless script.output_path.nil?
+          args.concat ["-e", script.error_path] unless script.error_path.nil?
           # Reservations are actually just queues in PBS Pro
-          args += ["-q", script.reservation_id] if !script.reservation_id.nil? && script.queue_name.nil?
-          args += ["-q", script.queue_name] unless script.queue_name.nil?
-          args += ["-p", script.priority] unless script.priority.nil?
-          args += ["-a", script.start_time.localtime.strftime("%C%y%m%d%H%M.%S")] unless script.start_time.nil?
-          args += ["-A", script.accounting_id] unless script.accounting_id.nil?
-          args += ["-l", "walltime=#{seconds_to_duration(script.wall_time)}"] unless script.wall_time.nil?
+          args.concat ["-q", script.reservation_id] if !script.reservation_id.nil? && script.queue_name.nil?
+          args.concat ["-q", script.queue_name] unless script.queue_name.nil?
+          args.concat ["-p", script.priority] unless script.priority.nil?
+          args.concat ["-a", script.start_time.localtime.strftime("%C%y%m%d%H%M.%S")] unless script.start_time.nil?
+          args.concat ["-A", script.accounting_id] unless script.accounting_id.nil?
+          args.concat ["-l", "walltime=#{seconds_to_duration(script.wall_time)}"] unless script.wall_time.nil?
 
           # Set dependencies
           depend = []
@@ -256,21 +276,21 @@ module OodCore
           depend << "afterok:#{afterok.join(":")}"       unless afterok.empty?
           depend << "afternotok:#{afternotok.join(":")}" unless afternotok.empty?
           depend << "afterany:#{afterany.join(":")}"     unless afterany.empty?
-          args += ["-W", "depend=#{depend.join(",")}"]   unless depend.empty?
+          args.concat ["-W", "depend=#{depend.join(",")}"]   unless depend.empty?
 
           # Set environment variables
           envvars = script.job_environment.to_h
-          args += ["-v", envvars.map{|k,v| "#{k}=#{v}"}.join(",")] unless envvars.empty?
-          args += ["-V"] if script.copy_environment?
+          args.concat ["-v", envvars.map{|k,v| "#{k}=#{v}"}.join(",")] unless envvars.empty?
+          args.concat ["-V"] if script.copy_environment?
 
           # If error_path is not specified we join stdout & stderr (as this
           # mimics what the other resource managers do)
-          args += ["-j", "oe"] if script.error_path.nil?
+          args.concat ["-j", "oe"] if script.error_path.nil?
 
-          args += ["-J", script.job_array_request] unless script.job_array_request.nil?
+          args.concat ["-J", script.job_array_request] unless script.job_array_request.nil?
 
           # Set native options
-          args += script.native if script.native
+          args.concat script.native if script.native
 
           # Submit job
           @pbspro.submit_string(script.content, args: args, chdir: script.workdir)