From ac5a19faaa71df6bb323a9d32716c0a224b4407b Mon Sep 17 00:00:00 2001 From: Lucas Nussbaum <lucas.nussbaum@loria.fr> Date: Sun, 9 May 2021 22:32:52 +0200 Subject: [PATCH] [dev] force creation of disk and diskpath properties on all sites (bug 9357) ... and update tests output accordingly there's no need to force the creation of gpu_model here since it part of the generated properties now. --- lib/refrepo/gen/oar-properties.rb | 3 ++- spec/output/bad_best_effort_property_print_stdout.txt | 3 ++- spec/output/chassis_unset_print_stdout.txt | 3 ++- spec/output/configured_misconfigured_cores_print_stdout.txt | 3 ++- spec/output/configured_misconfigured_gpu_print_stdout.txt | 3 ++- .../configured_missing_network_interfaces_print_stdout.txt | 3 ++- spec/output/configured_with_disk_print_stdout.txt | 3 ++- spec/output/configured_without_gpu_print_stdout.txt | 3 ++- .../configured_without_gpu_quirk_cluster_print_stdout.txt | 3 ++- spec/output/dahu_empty_print_stdout.txt | 3 ++- spec/output/different_value_wattmeters_print_stdout.txt | 3 ++- ...mpty_contiguous-grouped-by-threads_cpusets_print_stdout.txt | 3 ++- ...empty_contiguous-including-threads_cpusets_print_stdout.txt | 3 ++- spec/output/empty_print_stdout.txt | 3 ++- spec/output/empty_round_robin_print_stdout.txt | 3 ++- spec/output/empty_with_disk_print_stdout.txt | 3 ++- spec/output/empty_without_gpu_print_stdout.txt | 3 ++- spec/output/graffiti-all-gpus_print_stdout.txt | 3 ++- ...moved-OAR-updated-gpu-re-added-OAR-updated_print_stdout.txt | 3 ++- ...ffiti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt | 3 ++- spec/output/graffiti-gpu-removed-OAR-updated_print_stdout.txt | 3 ++- spec/output/graffiti-gpu-removed_print_stdout.txt | 3 ++- spec/output/graffiti_empty_print_stdout.txt | 3 ++- spec/output/graphite_empty_print_stdout.txt | 3 ++- spec/output/grimoire_empty_print_stdout.txt | 3 ++- spec/output/grue_empty_print_stdout.txt | 3 ++- spec/output/grue_nogpus_print_stdout.txt | 3 ++- spec/output/missing_property_print_stdout.txt | 3 ++- spec/output/non_reservable_gpus_print_stdout.txt | 3 ++- spec/output/wattmeters_nil_print_stdout.txt | 3 ++- spec/output/with-data_print_stdout.txt | 3 ++- ...sconfigured_resources_properties_and_disks_print_stdout.txt | 3 ++- spec/output/wrong_variable_type_print_stdout.txt | 3 ++- spec/output/yeti_empty_print_stdout.txt | 3 ++- 34 files changed, 68 insertions(+), 34 deletions(-) diff --git a/lib/refrepo/gen/oar-properties.rb b/lib/refrepo/gen/oar-properties.rb index 421cec68d84..594bf023d90 100644 --- a/lib/refrepo/gen/oar-properties.rb +++ b/lib/refrepo/gen/oar-properties.rb @@ -175,7 +175,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar } diff --git a/spec/output/bad_best_effort_property_print_stdout.txt b/spec/output/bad_best_effort_property_print_stdout.txt index 48c47943e3b..b80329da6ce 100644 --- a/spec/output/bad_best_effort_property_print_stdout.txt +++ b/spec/output/bad_best_effort_property_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/chassis_unset_print_stdout.txt b/spec/output/chassis_unset_print_stdout.txt index 7b554d35c1d..ae93482e068 100644 --- a/spec/output/chassis_unset_print_stdout.txt +++ b/spec/output/chassis_unset_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/configured_misconfigured_cores_print_stdout.txt b/spec/output/configured_misconfigured_cores_print_stdout.txt index b4e99c42946..88b19e700cf 100644 --- a/spec/output/configured_misconfigured_cores_print_stdout.txt +++ b/spec/output/configured_misconfigured_cores_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/configured_misconfigured_gpu_print_stdout.txt b/spec/output/configured_misconfigured_gpu_print_stdout.txt index 02aa7bef252..1d3e98d6406 100644 --- a/spec/output/configured_misconfigured_gpu_print_stdout.txt +++ b/spec/output/configured_misconfigured_gpu_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/configured_missing_network_interfaces_print_stdout.txt b/spec/output/configured_missing_network_interfaces_print_stdout.txt index 7a64504a582..8fe122e5172 100644 --- a/spec/output/configured_missing_network_interfaces_print_stdout.txt +++ b/spec/output/configured_missing_network_interfaces_print_stdout.txt @@ -44,7 +44,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/configured_with_disk_print_stdout.txt b/spec/output/configured_with_disk_print_stdout.txt index d7407cc7e14..8620500903c 100644 --- a/spec/output/configured_with_disk_print_stdout.txt +++ b/spec/output/configured_with_disk_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/configured_without_gpu_print_stdout.txt b/spec/output/configured_without_gpu_print_stdout.txt index b4e99c42946..88b19e700cf 100644 --- a/spec/output/configured_without_gpu_print_stdout.txt +++ b/spec/output/configured_without_gpu_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/configured_without_gpu_quirk_cluster_print_stdout.txt b/spec/output/configured_without_gpu_quirk_cluster_print_stdout.txt index b4e99c42946..88b19e700cf 100644 --- a/spec/output/configured_without_gpu_quirk_cluster_print_stdout.txt +++ b/spec/output/configured_without_gpu_quirk_cluster_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/dahu_empty_print_stdout.txt b/spec/output/dahu_empty_print_stdout.txt index 2fcc22417f9..827e880f3a2 100644 --- a/spec/output/dahu_empty_print_stdout.txt +++ b/spec/output/dahu_empty_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/different_value_wattmeters_print_stdout.txt b/spec/output/different_value_wattmeters_print_stdout.txt index 2d165c88033..a11bc7e7168 100644 --- a/spec/output/different_value_wattmeters_print_stdout.txt +++ b/spec/output/different_value_wattmeters_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/empty_contiguous-grouped-by-threads_cpusets_print_stdout.txt b/spec/output/empty_contiguous-grouped-by-threads_cpusets_print_stdout.txt index ebfdb979f25..9aff63a9a06 100644 --- a/spec/output/empty_contiguous-grouped-by-threads_cpusets_print_stdout.txt +++ b/spec/output/empty_contiguous-grouped-by-threads_cpusets_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/empty_contiguous-including-threads_cpusets_print_stdout.txt b/spec/output/empty_contiguous-including-threads_cpusets_print_stdout.txt index 0dca01f7fe4..39211488a27 100644 --- a/spec/output/empty_contiguous-including-threads_cpusets_print_stdout.txt +++ b/spec/output/empty_contiguous-including-threads_cpusets_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/empty_print_stdout.txt b/spec/output/empty_print_stdout.txt index 09d8a27dfcd..7aa05535b4a 100644 --- a/spec/output/empty_print_stdout.txt +++ b/spec/output/empty_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/empty_round_robin_print_stdout.txt b/spec/output/empty_round_robin_print_stdout.txt index 2cfe5a4ceda..a64ee00c9ab 100644 --- a/spec/output/empty_round_robin_print_stdout.txt +++ b/spec/output/empty_round_robin_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/empty_with_disk_print_stdout.txt b/spec/output/empty_with_disk_print_stdout.txt index 2da64d29a37..464a58379c9 100644 --- a/spec/output/empty_with_disk_print_stdout.txt +++ b/spec/output/empty_with_disk_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/empty_without_gpu_print_stdout.txt b/spec/output/empty_without_gpu_print_stdout.txt index 2da64d29a37..464a58379c9 100644 --- a/spec/output/empty_without_gpu_print_stdout.txt +++ b/spec/output/empty_without_gpu_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/graffiti-all-gpus_print_stdout.txt b/spec/output/graffiti-all-gpus_print_stdout.txt index 4e9d48605a3..f3778dc0f42 100644 --- a/spec/output/graffiti-all-gpus_print_stdout.txt +++ b/spec/output/graffiti-all-gpus_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_print_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_print_stdout.txt index 4e9d48605a3..f3778dc0f42 100644 --- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_print_stdout.txt +++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt index 456cb859695..c60033e89b2 100644 --- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt +++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt @@ -43,7 +43,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/graffiti-gpu-removed-OAR-updated_print_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated_print_stdout.txt index eb54b2bcd55..a10bf0d208a 100644 --- a/spec/output/graffiti-gpu-removed-OAR-updated_print_stdout.txt +++ b/spec/output/graffiti-gpu-removed-OAR-updated_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/graffiti-gpu-removed_print_stdout.txt b/spec/output/graffiti-gpu-removed_print_stdout.txt index 0fc46bd1bd9..cc1810390f9 100644 --- a/spec/output/graffiti-gpu-removed_print_stdout.txt +++ b/spec/output/graffiti-gpu-removed_print_stdout.txt @@ -43,7 +43,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/graffiti_empty_print_stdout.txt b/spec/output/graffiti_empty_print_stdout.txt index 8fe04c0c95c..b2e2b249c4e 100644 --- a/spec/output/graffiti_empty_print_stdout.txt +++ b/spec/output/graffiti_empty_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/graphite_empty_print_stdout.txt b/spec/output/graphite_empty_print_stdout.txt index 9a7a06ade63..6299b36a722 100644 --- a/spec/output/graphite_empty_print_stdout.txt +++ b/spec/output/graphite_empty_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/grimoire_empty_print_stdout.txt b/spec/output/grimoire_empty_print_stdout.txt index c0dc3f21856..06936dec58d 100644 --- a/spec/output/grimoire_empty_print_stdout.txt +++ b/spec/output/grimoire_empty_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/grue_empty_print_stdout.txt b/spec/output/grue_empty_print_stdout.txt index c33077bc22c..54a16573e50 100644 --- a/spec/output/grue_empty_print_stdout.txt +++ b/spec/output/grue_empty_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/grue_nogpus_print_stdout.txt b/spec/output/grue_nogpus_print_stdout.txt index 0dcb5de3ada..10f2c868a7f 100644 --- a/spec/output/grue_nogpus_print_stdout.txt +++ b/spec/output/grue_nogpus_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/missing_property_print_stdout.txt b/spec/output/missing_property_print_stdout.txt index 7b554d35c1d..ae93482e068 100644 --- a/spec/output/missing_property_print_stdout.txt +++ b/spec/output/missing_property_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/non_reservable_gpus_print_stdout.txt b/spec/output/non_reservable_gpus_print_stdout.txt index e4bd50fa3a9..3f8956eb105 100644 --- a/spec/output/non_reservable_gpus_print_stdout.txt +++ b/spec/output/non_reservable_gpus_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/wattmeters_nil_print_stdout.txt b/spec/output/wattmeters_nil_print_stdout.txt index 23e7dd5c228..0a7fb631227 100644 --- a/spec/output/wattmeters_nil_print_stdout.txt +++ b/spec/output/wattmeters_nil_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/with-data_print_stdout.txt b/spec/output/with-data_print_stdout.txt index 7b554d35c1d..ae93482e068 100644 --- a/spec/output/with-data_print_stdout.txt +++ b/spec/output/with-data_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/with_disk_misconfigured_resources_properties_and_disks_print_stdout.txt b/spec/output/with_disk_misconfigured_resources_properties_and_disks_print_stdout.txt index d7407cc7e14..8620500903c 100644 --- a/spec/output/with_disk_misconfigured_resources_properties_and_disks_print_stdout.txt +++ b/spec/output/with_disk_misconfigured_resources_properties_and_disks_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/wrong_variable_type_print_stdout.txt b/spec/output/wrong_variable_type_print_stdout.txt index 7b554d35c1d..ae93482e068 100644 --- a/spec/output/wrong_variable_type_print_stdout.txt +++ b/spec/output/wrong_variable_type_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# diff --git a/spec/output/yeti_empty_print_stdout.txt b/spec/output/yeti_empty_print_stdout.txt index 3e1777d2723..7fb22e9f48d 100644 --- a/spec/output/yeti_empty_print_stdout.txt +++ b/spec/output/yeti_empty_print_stdout.txt @@ -42,7 +42,8 @@ property_exist 'cpu' || oarproperty -a cpu property_exist 'core' || oarproperty -a core property_exist 'gpudevice' || oarproperty -a gpudevice property_exist 'gpu' || oarproperty -a gpu -property_exist 'gpu_model' || oarproperty -a gpu_model --varchar +property_exist 'disk' || oarproperty -a disk --varchar +property_exist 'diskpath' || oarproperty -a diskpath --varchar ############################################# -- GitLab