From 9ad7843f71a640b7814fbc6055fb05176f18acd1 Mon Sep 17 00:00:00 2001 From: Masahiro Nakao Date: Mon, 6 Mar 2023 22:48:02 +0900 Subject: [PATCH] Fix bugs in Fujitsu TCS adapter (#800) Fujitsu Code cleanup based on syntax and conventions and Fix some bugs in Fujitsu TCS adapter --- lib/ood_core/job/adapters/fujitsu_tcs.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/ood_core/job/adapters/fujitsu_tcs.rb b/lib/ood_core/job/adapters/fujitsu_tcs.rb index caa22ae7f..d48a30cbe 100644 --- a/lib/ood_core/job/adapters/fujitsu_tcs.rb +++ b/lib/ood_core/job/adapters/fujitsu_tcs.rb @@ -221,10 +221,12 @@ def submit(script, after: [], afterok: [], afternotok: [], afterany: []) else args.concat ["-e", script.error_path] end - args.concat ["--rscgrp", script.queue_name] unless script.queue_name.nil? + args.concat ["-L rscgrp=" + script.queue_name] unless script.queue_name.nil? args.concat ["-p", script.priority] unless script.priority.nil? - args.concat ["--at", script.start_time.localtime.strftime("%C%y-%m-%dT%H:%M:%S")] unless script.start_time.nil? - args.concat ["-L \"elapse=" + seconds_to_duration(script.wall_time) + "\""] unless script.wall_time.nil? + + # start_time: <%= Time.local(2023,11,22,13,4).to_i %> in form.yml.erb + args.concat ["--at", script.start_time.localtime.strftime("%C%y%m%d%H%M")] unless script.start_time.nil? + args.concat ["-L elapse=" + seconds_to_duration(script.wall_time)] unless script.wall_time.nil? args.concat ["--bulk", "--sparam", script.job_array_request] unless script.job_array_request.nil? # Set environment variables