Commit d11ec0e2 authored by DELABROYE Dimitri's avatar DELABROYE Dimitri

[refapi] fix bug #9939 remove redundant queues definition on input

parent 4ea98317
Pipeline #90316 passed with stages
in 2 minutes and 56 seconds
......@@ -3,8 +3,8 @@
"kavlan": true,
"model": "Dell PowerEdge R730",
"queues": [
"production",
"admin"
"admin",
"production"
],
"type": "cluster",
"uid": "grele"
......
......@@ -3,8 +3,8 @@
"kavlan": true,
"model": "Dell PowerEdge R730",
"queues": [
"production",
"admin"
"admin",
"production"
],
"type": "cluster",
"uid": "grimani"
......
......@@ -3,8 +3,8 @@
"kavlan": true,
"model": "Dell PowerEdge R630",
"queues": [
"default",
"admin"
"admin",
"default"
],
"type": "cluster",
"uid": "ecotype"
......
......@@ -19,9 +19,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- admin
- default
network_adapters:
bmc:
interface: Ethernet
......
......@@ -18,9 +18,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- admin
- default
network_adapters:
bmc:
interface: Ethernet
......
......@@ -15,9 +15,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- admin
- default
processor:
microarchitecture: Broadwell
performance:
......
......@@ -15,9 +15,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- admin
- default
processor:
microarchitecture: Zen
performance:
......
......@@ -15,9 +15,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- admin
- default
processor:
microarchitecture: Broadwell
performance:
......
......@@ -15,9 +15,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- admin
- default
processor:
microarchitecture: Skylake
performance:
......
......@@ -16,9 +16,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- default
- admin
storage_devices:
sda:
interface: SAS
......
......@@ -16,9 +16,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- default
- admin
storage_devices:
sda:
interface: SATA
......
......@@ -28,9 +28,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- default
- admin
storage_devices:
sda:
interface: SATA
......
......@@ -26,9 +26,6 @@ nodes:
supported_job_types:
deploy: true
besteffort: true
queues:
- default
- admin
max_walltime: 0
storage_devices:
sda:
......
......@@ -42,9 +42,6 @@ nodes:
supported_job_types:
deploy: true
besteffort: true
queues:
- default
- admin
max_walltime: 0
storage_devices:
sda:
......
......@@ -29,9 +29,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- default
- admin
storage_devices:
sda:
interface: SCSI
......
......@@ -12,9 +12,6 @@ nodes:
supported_job_types:
deploy: true
besteffort: true
queues:
- admin
- production
performance:
core_flops: 17713000000
node_flops: 202670000000
......
......@@ -18,9 +18,6 @@ nodes:
supported_job_types:
deploy: true
besteffort: true
queues:
- admin
- production
storage_devices:
sda:
interface: SCSI
......
......@@ -17,9 +17,6 @@ nodes:
supported_job_types:
deploy: true
besteffort: true
queues:
- admin
- production
processor:
microarchitecture: Haswell
storage_devices:
......
......@@ -20,9 +20,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- default
- admin
storage_devices:
sda:
interface: SATA II
......
......@@ -15,9 +15,6 @@ nodes:
supported_job_types:
deploy: true
besteffort: true
queues:
- admin
- production
gpu:
gpu: false
network_adapters:
......
......@@ -4,18 +4,15 @@ model: Dell PowerEdge R730
created_at: 2017-06-26
kavlan: true
queues:
- production
- admin
- production
nodes:
# Global node properties
grele-[1-14]:
supported_job_types:
deploy: true
besteffort: true
queues:
- admin
- production
performance:
core_flops: 15690000000
node_flops: 398100000000
......@@ -49,7 +46,7 @@ nodes:
mounted: false
bmc:
enabled: true
mountable: false
mountable: false
mounted: false
interface: Ethernet
ib0:
......
......@@ -4,8 +4,8 @@ model: Dell PowerEdge R730
created_at: 2016-08-30
kavlan: true
queues:
- production
- admin
- production
nodes:
# Global node properties
......@@ -16,9 +16,6 @@ nodes:
supported_job_types:
deploy: true
besteffort: true
queues:
- admin
- production
gpu:
gpu: true
gpu_count: 2
......
......@@ -19,9 +19,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- admin
- default
storage_devices:
sda:
interface: SCSI
......
......@@ -19,9 +19,6 @@ nodes:
supported_job_types:
deploy: true
besteffort: true
queues:
- admin
- default
max_walltime: 0
storage_devices:
sda:
......
......@@ -16,9 +16,6 @@ nodes:
supported_job_types:
deploy: true
besteffort: true
queues:
- admin
- production
gpu:
gpu: false
network_adapters:
......
......@@ -17,9 +17,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- default
- admin
storage_devices:
sda:
interface: SATA
......
......@@ -4,8 +4,8 @@ model: Dell PowerEdge R630
created_at: 2017-10-16 17:40:55.149032
kavlan: true
queues:
- default
- admin
- default
nodes:
ecotype-[1-48]:
......@@ -18,9 +18,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- admin
- default
network_adapters:
eth0:
mounted: true
......
......@@ -16,9 +16,6 @@ nodes:
supported_job_types:
deploy: true
besteffort: true
queues:
- default
- admin
max_walltime: 0
storage_devices:
sda:
......
......@@ -33,9 +33,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- default
- admin
storage_devices:
sda:
interface: SATA
......
......@@ -17,9 +17,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- default
- admin
storage_devices:
sda:
interface: SATA
......
......@@ -17,9 +17,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- default
- admin
storage_devices:
sda:
interface: SATA
......
......@@ -17,9 +17,6 @@ nodes:
deploy: true
besteffort: true
max_walltime: 0
queues:
- default
- admin
storage_devices:
sda:
interface: SATA
......
......@@ -16,9 +16,6 @@ nodes:
supported_job_types:
deploy: true
besteffort: true
queues:
- default
- admin
max_walltime: 0
storage_devices:
sda:
......
......@@ -16,9 +16,6 @@ nodes:
supported_job_types:
deploy: true
besteffort: true
queues:
- default
- admin
max_walltime: 0
gpu:
gpu: false
......
......@@ -222,6 +222,8 @@ def generate_reference_api
node["main_memory"] = {} unless node.key?("main_memory")
node['supported_job_types']['queues'] = cluster['queues'] unless node['supported_job_types'].key?('queues')
# Delete keys
#raise 'node["storage_devices"] is nil' if node["storage_devices"].nil?
Hash(node["storage_devices"]).keys.each { |key|
......
......@@ -118,6 +118,6 @@ supported_job_types:
besteffort: boolean
deploy: boolean
max_walltime: integer
queues: array
queues: optional_array
virtual: optional # optional_boolean # string
addressing_plan: optional
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment