Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/ood_core/job/adapters/slurm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,6 @@ def str_to_queue_info(line)
end.to_h.symbolize_keys

hsh[:name] = hsh[:PartitionName]
hsh[:qos] = hsh[:QoS].to_s == 'N/A' ? [] : hsh[:QoS].to_s.split(',')
hsh[:allow_accounts] = if hsh[:AllowAccounts].nil? || hsh[:AllowAccounts].to_s == 'ALL'
nil
else
Expand Down
3 changes: 0 additions & 3 deletions lib/ood_core/job/queue_info.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ class OodCore::Job::QueueInfo
attr_reader :name
alias to_s name

# The QoSes associated with this queue
attr_reader :qos

# The accounts that are allowed to use this queue.
#
# nil means ALL accounts are allowed.
Expand Down
4 changes: 0 additions & 4 deletions spec/job/adapters/slurm_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1402,13 +1402,11 @@ def job_info(opts = {})
systems_queue = queues.select { |q| q.name == 'systems' }.first
expect(systems_queue.allow_accounts).to eq(['root', 'pzs0708', 'pzs0710', 'pzs0722'])
expect(systems_queue.deny_accounts).to eq([])
expect(systems_queue.qos).to eq([])
expect(systems_queue.gpu?).to eq(true)

quick_queue = queues.select { |q| q.name == 'quick' }.first
expect(quick_queue.allow_accounts).to eq(nil)
expect(quick_queue.deny_accounts).to eq(quick_deny_accounts)
expect(quick_queue.qos).to eq(['quick'])
expect(quick_queue.gpu?).to eq(false)

gpu_queue = queues.select { |q| q.name == 'gpuserial' }.first
Expand Down Expand Up @@ -1442,12 +1440,10 @@ def job_info(opts = {})
systems_queue = queues.select { |q| q.name == 'systems' }.first
expect(systems_queue.allow_accounts).to eq(['ROOT', 'PZS0708', 'PZS0710', 'PZS0722'])
expect(systems_queue.deny_accounts).to eq([])
expect(systems_queue.qos).to eq([])

quick_queue = queues.select { |q| q.name == 'quick' }.first
expect(quick_queue.allow_accounts).to eq(nil)
expect(quick_queue.deny_accounts).to eq(quick_deny_accounts)
expect(quick_queue.qos).to eq(['quick'])
end
end
end
Expand Down