Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 271f1cc4 authored by Pierre Neyron's avatar Pierre Neyron :bicyclist: Committed by LOUP David
Browse files

[spec] update expected results because max_walltime should be equal for disk and node

parent 549d1126
No related branches found
No related tags found
1 merge request!130Bug12144 positionnement des propriétés sur les ressources disk comme sur les ressources default
Pipeline #178334 passed
Stage: validate
    Stage: generate
      Stage: deploy
        Hide whitespace changes
        Inline Side-by-side
        spec/oar_properties_spec.rb
        + 8
        − 8
        View file @ 271f1cc4
        ......@@ -972,7 +972,7 @@ disk_exist 'clusterb-2.fakesite.grid5000.fr' 'sdd.clusterb-2' && echo '=> disk a
        disk_exist 'clusterb-2.fakesite.grid5000.fr' 'sdd.clusterb-2' || oarnodesetting -a -h '' -p host='clusterb-2.fakesite.grid5000.fr' -p type='disk' -p disk='sdd.clusterb-2'
        echo; echo 'Setting properties for disk sdd.clusterb-2 on host clusterb-2.fakesite.grid5000.fr:'; echo
        oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='disk' and disk='sdd.clusterb-2'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=0 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3 -p host='clusterb-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clusterb-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
        oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='disk' and disk='sdd.clusterb-2'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3 -p host='clusterb-2.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdd.clusterb-2' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0' -p cpuset=-1
        TXT
        generator_output = capture do
        ......@@ -1109,7 +1109,7 @@ TXT
        ["+", "ib_rate", 0]
        ["+", "ip", "172.16.64.1"]
        ["+", "maintenance", "NO"]
        ["+", "max_walltime", 0]
        ["+", "max_walltime", 86400]
        ["+", "memcore", 8192]
        ["+", "memcpu", 65536]
        ["+", "memnode", 131072]
        ......@@ -1151,7 +1151,7 @@ TXT
        ["+", "ib_rate", 0]
        ["+", "ip", "172.16.64.1"]
        ["+", "maintenance", "NO"]
        ["+", "max_walltime", 0]
        ["+", "max_walltime", 86400]
        ["+", "memcore", 8192]
        ["+", "memcpu", 65536]
        ["+", "memnode", 131072]
        ......@@ -1193,7 +1193,7 @@ TXT
        ["+", "ib_rate", 0]
        ["+", "ip", "172.16.64.1"]
        ["+", "maintenance", "NO"]
        ["+", "max_walltime", 0]
        ["+", "max_walltime", 86400]
        ["+", "memcore", 8192]
        ["+", "memcpu", 65536]
        ["+", "memnode", 131072]
        ......@@ -1235,7 +1235,7 @@ TXT
        ["+", "ib_rate", 0]
        ["+", "ip", "172.16.64.2"]
        ["+", "maintenance", "NO"]
        ["+", "max_walltime", 0]
        ["+", "max_walltime", 86400]
        ["+", "memcore", 8192]
        ["+", "memcpu", 65536]
        ["+", "memnode", 131072]
        ......@@ -1277,7 +1277,7 @@ TXT
        ["+", "ib_rate", 0]
        ["+", "ip", "172.16.64.2"]
        ["+", "maintenance", "NO"]
        ["+", "max_walltime", 0]
        ["+", "max_walltime", 86400]
        ["+", "memcore", 8192]
        ["+", "memcpu", 65536]
        ["+", "memnode", 131072]
        ......@@ -1319,7 +1319,7 @@ TXT
        ["+", "ib_rate", 0]
        ["+", "ip", "172.16.64.2"]
        ["+", "maintenance", "NO"]
        ["+", "max_walltime", 0]
        ["+", "max_walltime", 86400]
        ["+", "memcore", 8192]
        ["+", "memcpu", 65536]
        ["+", "memnode", 131072]
        ......@@ -2687,7 +2687,7 @@ disk_exist 'clusterb-1.fakesite.grid5000.fr' 'sdb.clusterb-1' && echo '=> disk a
        disk_exist 'clusterb-1.fakesite.grid5000.fr' 'sdb.clusterb-1' || oarnodesetting -a -h '' -p host='clusterb-1.fakesite.grid5000.fr' -p type='disk' -p disk='sdb.clusterb-1'
        echo; echo 'Setting properties for disk sdb.clusterb-1 on host clusterb-1.fakesite.grid5000.fr:'; echo
        oarnodesetting --sql "host='clusterb-1.fakesite.grid5000.fr' and type='disk' and disk='sdb.clusterb-1'" -p ip='172.16.64.1' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=0 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3 -p host='clusterb-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clusterb-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
        oarnodesetting --sql "host='clusterb-1.fakesite.grid5000.fr' and type='disk' and disk='sdb.clusterb-1'" -p ip='172.16.64.1' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3 -p host='clusterb-1.fakesite.grid5000.fr' -p available_upto=0 -p disk='sdb.clusterb-1' -p diskpath='/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0' -p cpuset=-1
        TXT
        expected_output4 = <<-TXT
        ......
        spec/stub_oar_properties/dump_oar_api_configured_server_quirk_cluster.json
        + 6
        − 6
        View file @ 271f1cc4
        ......@@ -1330,7 +1330,7 @@
        "cpu" : null,
        "next_finaud_decision" : "NO",
        "gpu" : null,
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "nodemodel" : "Dell PowerEdge T640",
        "state_num" : 1,
        "opa_rate" : 0,
        ......@@ -1386,7 +1386,7 @@
        "gpu_model" : null,
        "besteffort" : "YES",
        "gpu" : null,
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "nodemodel" : "Dell PowerEdge T640",
        "gpudevice" : null,
        "desktop_computing" : "NO",
        ......@@ -1455,7 +1455,7 @@
        "cpucore" : 8,
        "gpu_model" : null,
        "nodemodel" : "Dell PowerEdge T640",
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "gpu" : null,
        "eth_rate" : 10,
        "cpuarch" : "x86_64",
        ......@@ -2783,7 +2783,7 @@
        "host" : "clusterc-2.fakesite.grid5000.fr",
        "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
        "nodemodel" : "Dell PowerEdge T640",
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "gpu" : null,
        "eth_rate" : 10,
        "cpuarch" : "x86_64",
        ......@@ -2854,7 +2854,7 @@
        },
        {
        "gpu" : null,
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "nodemodel" : "Dell PowerEdge T640",
        "state_num" : 1,
        "opa_rate" : 0,
        ......@@ -2942,7 +2942,7 @@
        "eth_rate" : 10,
        "cpuarch" : "x86_64",
        "gpu" : null,
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "nodemodel" : "Dell PowerEdge T640",
        "host" : "clusterc-2.fakesite.grid5000.fr",
        "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
        ......
        spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json
        + 6
        − 6
        View file @ 271f1cc4
        ......@@ -1328,7 +1328,7 @@
        "ib_rate" : 0,
        "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
        "switch" : null,
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "production" : "YES",
        "disk_reservation_count" : 3,
        "disktype" : "SATA",
        ......@@ -1393,7 +1393,7 @@
        "mic" : "NO",
        "disktype" : "SATA",
        "disk_reservation_count" : 3,
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "production" : "YES",
        "switch" : null,
        "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
        ......@@ -1459,7 +1459,7 @@
        "state" : "Alive",
        "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
        "switch" : null,
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "production" : "YES",
        "disk_reservation_count" : 3,
        "eth_count" : 1,
        ......@@ -2778,7 +2778,7 @@
        "nodemodel" : "Dell PowerEdge T640",
        "host" : "clusterb-2.fakesite.grid5000.fr",
        "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "production" : "YES",
        "disk_reservation_count" : 3,
        "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:1:0",
        ......@@ -2913,7 +2913,7 @@
        "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
        "disk_reservation_count" : 3,
        "production" : "YES",
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "next_state" : "UnChanged",
        "host" : "clusterb-2.fakesite.grid5000.fr",
        "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
        ......@@ -2973,7 +2973,7 @@
        "disktype" : "SATA",
        "disk_reservation_count" : 3,
        "production" : "YES",
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "switch" : null,
        "diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
        "besteffort" : "YES",
        ......
        spec/stub_oar_properties/dump_oar_api_configured_server_without_gpu.json
        + 6
        − 6
        View file @ 271f1cc4
        ......@@ -1331,7 +1331,7 @@
        "cpu" : null,
        "next_finaud_decision" : "NO",
        "gpu" : null,
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "nodemodel" : "Dell PowerEdge T640",
        "state_num" : 1,
        "opa_rate" : 0,
        ......@@ -1386,7 +1386,7 @@
        "gpu_model" : null,
        "besteffort" : "YES",
        "gpu" : null,
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "nodemodel" : "Dell PowerEdge T640",
        "gpudevice" : null,
        "desktop_computing" : "NO",
        ......@@ -1455,7 +1455,7 @@
        "cpucore" : 8,
        "gpu_model" : null,
        "nodemodel" : "Dell PowerEdge T640",
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "gpu" : null,
        "eth_rate" : 10,
        "exotic" : "NO",
        ......@@ -2783,7 +2783,7 @@
        "host" : "clusterc-2.fakesite.grid5000.fr",
        "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
        "nodemodel" : "Dell PowerEdge T640",
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "gpu" : null,
        "eth_rate" : 10,
        "cpuarch" : "x86_64",
        ......@@ -2854,7 +2854,7 @@
        },
        {
        "gpu" : null,
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "nodemodel" : "Dell PowerEdge T640",
        "state_num" : 1,
        "opa_rate" : 0,
        ......@@ -2942,7 +2942,7 @@
        "eth_rate" : 10,
        "cpuarch" : "x86_64",
        "gpu" : null,
        "max_walltime" : 0,
        "max_walltime" : 86400,
        "nodemodel" : "Dell PowerEdge T640",
        "host" : "clusterc-2.fakesite.grid5000.fr",
        "chassis" : "Dell Inc. PowerEdge T640 9L1CBX2",
        ......
        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