Merge branch 'taurus' into 'master'

[taurus] Put taurus-12 to retired. See merge request !372

Merge branch 'taurus' into 'master'
e0d64808 · JACQUOT Pierre · 79c9a674 · 4988a46c · 79c9a674 · e0d64808
Commit e0d64808 authored 3 years ago by JACQUOT Pierre
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 12,
-    "nb_procs": 2,
-    "nb_threads": 24,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "12/06/2019",
-    "vendor": "Dell Inc.",
-    "version": "2.9.0"
-  },
-  "bmc_version": "2.65.65.65",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge R720",
-    "serial": "GHTHD5J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.193.12",
-      "kavlan-11": "10.7.201.12",
-      "kavlan-12": "10.11.201.12",
-      "kavlan-13": "10.15.201.12",
-      "kavlan-14": "10.19.201.12",
-      "kavlan-16": "10.27.201.12",
-      "kavlan-18": "10.35.201.12",
-      "kavlan-2": "192.168.209.12",
-      "kavlan-20": "10.43.201.12",
-      "kavlan-21": "10.47.201.12",
-      "kavlan-3": "192.168.225.12",
-      "kavlan-4": "10.12.1.12",
-      "kavlan-5": "10.12.65.12",
-      "kavlan-6": "10.12.129.12",
-      "kavlan-7": "10.12.193.12",
-      "kavlan-8": "10.13.1.12",
-      "kavlan-9": "10.13.65.12"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:480:1::c",
-      "kavlan-11": "2001:660:4406:1a0:401::c",
-      "kavlan-12": "2001:660:4406:2a0:401::c",
-      "kavlan-13": "2001:660:4406:4a0:401::c",
-      "kavlan-14": "2001:660:4406:5a0:401::c",
-      "kavlan-16": "2001:660:4406:7a0:401::c",
-      "kavlan-18": "2001:660:4406:8a0:401::c",
-      "kavlan-2": "2001:660:4406:481:1::c",
-      "kavlan-20": "2001:660:4406:3a0:401::c",
-      "kavlan-21": "2001:660:4406:6a0:401::c",
-      "kavlan-3": "2001:660:4406:482:1::c",
-      "kavlan-4": "2001:660:4406:490:1::c",
-      "kavlan-5": "2001:660:4406:491:1::c",
-      "kavlan-6": "2001:660:4406:492:1::c",
-      "kavlan-7": "2001:660:4406:493:1::c",
-      "kavlan-8": "2001:660:4406:494:1::c",
-      "kavlan-9": "2001:660:4406:495:1::c"
-    }
-  },
-  "main_memory": {
-    "ram_size": 34359738368
-  },
-  "management_tools": {
-    "bmc_vendor_tool": "racadm",
-    "ipmitool": {
-      "retries": 5
-    }
-  },
-  "memory_devices": [
-    {
-      "device": "dimm_a1 ",
-      "size": 4294967296,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_a2 ",
-      "size": 4294967296,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_a3 ",
-      "size": 4294967296,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_a4 ",
-      "size": 4294967296,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b1 ",
-      "size": 4294967296,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b2 ",
-      "size": 4294967296,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b3 ",
-      "size": 4294967296,
-      "technology": "dram"
-    },
-    {
-      "device": "dimm_b4 ",
-      "size": 4294967296,
-      "technology": "dram"
-    }
-  ],
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0x8000095d, 19.5.12",
-      "interface": "Ethernet",
-      "ip": "172.16.48.12",
-      "ip6": "2001:660:4406:400:1::c",
-      "kavlan": true,
-      "mac": "a0:36:9f:08:f8:f4",
-      "management": false,
-      "model": "Ethernet 10G 2P X520 Adapter",
-      "mountable": true,
-      "mounted": true,
-      "name": "enp68s0f0",
-      "network_address": "taurus-12.lyon.grid5000.fr",
-      "rate": 10000000000,
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "switch": "force10",
-      "switch_port": "TenGigabitEthernet 0/12",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "ixgbe",
-      "enabled": false,
-      "firmware_version": "0x8000095d, 19.5.12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "a0:36:9f:08:f8:f6",
-      "management": false,
-      "model": "Ethernet 10G 2P X520 Adapter",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp68s0f1",
-      "sriov": true,
-      "sriov_totalvfs": 63,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.67, 0x80000faa, 19.5.12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "bc:30:5b:ef:04:28",
-      "management": false,
-      "model": "I350 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno1",
-      "sriov": true,
-      "sriov_totalvfs": 7,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.67, 0x80000faa, 19.5.12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "bc:30:5b:ef:04:29",
-      "management": false,
-      "model": "I350 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno2",
-      "sriov": true,
-      "sriov_totalvfs": 7,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth4",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.67, 0x80000faa, 19.5.12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "bc:30:5b:ef:04:2a",
-      "management": false,
-      "model": "I350 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno3",
-      "sriov": true,
-      "sriov_totalvfs": 7,
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth5",
-      "driver": "igb",
-      "enabled": false,
-      "firmware_version": "1.67, 0x80000faa, 19.5.12",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "bc:30:5b:ef:04:2b",
-      "management": false,
-      "model": "I350 Gigabit Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "eno4",
-      "sriov": true,
-      "sriov_totalvfs": 7,
-      "vendor": "Intel"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.48.12",
-      "kavlan": false,
-      "mac": "f0:1f:af:ec:dd:3b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "taurus-12-bmc.lyon.grid5000.fr",
-      "rate": 1000000000
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "intel_idle",
-    "cstate_governor": "menu",
-    "ht_enabled": true,
-    "pstate_driver": "intel_cpufreq",
-    "pstate_governor": "performance",
-    "turboboost_enabled": true
-  },
-  "pdu": [
-    {
-      "port": 34,
-      "uid": "wattmetre1"
-    }
-  ],
-  "performance": {
-    "core_flops": 18400000000,
-    "node_flops": 220800000000
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 262144,
-    "cache_l3": 15728640,
-    "clock_speed": 2300000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Sandy Bridge",
-    "microcode": "0x71a",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz",
-    "vendor": "Intel",
-    "version": "E5-2630"
-  },
-  "software": {
-    "forced-deployment-timestamp": 202007300948,
-    "postinstall-version": "1.2022042109",
-    "standard-environment": "debian11-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x6d4ae520ab2dde0029002ee60c9faa27",
-      "by_path": "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0",
-      "firmware_version": 3.13,
-      "id": "disk0",
-      "interface": "RAID-0 (1 disk)",
-      "model": "PERC H710",
-      "size": 299439751168,
-      "storage": "HDD",
-      "vendor": "Dell"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "taurus-12"
-}
\ No newline at end of file
--- a/data/grid5000/sites/lyon/network_equipments/force10.json
+++ b/data/grid5000/sites/lyon/network_equipments/force10.json
@@ -78,10 +78,6 @@
          "uid": "taurus-11"
        },
        {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "TenGigabitEthernet 0/12",
-          "uid": "taurus-12"
        },
        {
          "kind": "node",

--- a/data/grid5000/sites/lyon/pdus/wattmetre1.json
+++ b/data/grid5000/sites/lyon/pdus/wattmetre1.json
@@ -40,7 +40,6 @@
    "31": "taurus-9",
    "32": "taurus-10",
    "33": "taurus-11",
-    "34": "taurus-12",
    "35": "taurus-13",
    "36": "taurus-14",
    "37": "taurus-15",

--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
-# Generated by g5k-checks (g5k-checks -m api)
---
-taurus-12:
-  architecture:
-    cpu_core_numbering: round-robin
-    nb_cores: 12
-    nb_procs: 2
-    nb_threads: 24
-    platform_type: x86_64
-  bios:
-    release_date: 12/06/2019
-    vendor: Dell Inc.
-    version: 2.9.0
-  bmc_version: 2.65.65.65
-  chassis:
-    manufacturer: Dell Inc.
-    name: PowerEdge R720
-    serial: GHTHD5J
-  main_memory:
-    ram_size: 34359738368
-  memory_devices:
-    'dimm_a1 ':
-      size: 4294967296
-      technology: dram
-    'dimm_a2 ':
-      size: 4294967296
-      technology: dram
-    'dimm_a3 ':
-      size: 4294967296
-      technology: dram
-    'dimm_a4 ':
-      size: 4294967296
-      technology: dram
-    'dimm_b1 ':
-      size: 4294967296
-      technology: dram
-    'dimm_b2 ':
-      size: 4294967296
-      technology: dram
-    'dimm_b3 ':
-      size: 4294967296
-      technology: dram
-    'dimm_b4 ':
-      size: 4294967296
-      technology: dram
-  network_adapters:
-    bmc:
-      ip: 172.17.48.12
-      mac: f0:1f:af:ec:dd:3b
-      management: true
-    eth0:
-      driver: ixgbe
-      firmware_version: 0x8000095d, 19.5.12
-      interface: Ethernet
-      ip: 172.16.48.12
-      mac: a0:36:9f:08:f8:f4
-      management: false
-      model: Ethernet 10G 2P X520 Adapter
-      name: enp68s0f0
-      rate: 10000000000
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth1:
-      driver: ixgbe
-      firmware_version: 0x8000095d, 19.5.12
-      interface: Ethernet
-      mac: a0:36:9f:08:f8:f6
-      management: false
-      model: Ethernet 10G 2P X520 Adapter
-      name: enp68s0f1
-      sriov: true
-      sriov_totalvfs: 63
-      vendor: Intel
-    eth2:
-      driver: igb
-      firmware_version: 1.67, 0x80000faa, 19.5.12
-      interface: Ethernet
-      mac: bc:30:5b:ef:04:28
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno1
-      sriov: true
-      sriov_totalvfs: 7
-      vendor: Intel
-    eth3:
-      driver: igb
-      firmware_version: 1.67, 0x80000faa, 19.5.12
-      interface: Ethernet
-      mac: bc:30:5b:ef:04:29
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno2
-      sriov: true
-      sriov_totalvfs: 7
-      vendor: Intel
-    eth4:
-      driver: igb
-      firmware_version: 1.67, 0x80000faa, 19.5.12
-      interface: Ethernet
-      mac: bc:30:5b:ef:04:2a
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno3
-      sriov: true
-      sriov_totalvfs: 7
-      vendor: Intel
-    eth5:
-      driver: igb
-      firmware_version: 1.67, 0x80000faa, 19.5.12
-      interface: Ethernet
-      mac: bc:30:5b:ef:04:2b
-      management: false
-      model: I350 Gigabit Network Connection
-      name: eno4
-      sriov: true
-      sriov_totalvfs: 7
-      vendor: Intel
-  operating_system:
-    cstate_driver: intel_idle
-    cstate_governor: menu
-    ht_enabled: true
-    pstate_driver: intel_cpufreq
-    pstate_governor: performance
-    turboboost_enabled: true
-  processor:
-    cache_l1d: 32768
-    cache_l1i: 32768
-    cache_l2: 262144
-    cache_l3: 15728640
-    ht_capable: true
-    instruction_set: x86-64
-    microcode: '0x71a'
-    model: Intel Xeon
-    other_description: Intel(R) Xeon(R) CPU E5-2630 0 @ 2.30GHz
-    vendor: Intel
-    version: E5-2630
-  storage_devices:
-    pci-0000:02:00.0-scsi-0:2:0:0:
-      by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2dde0029002ee60c9faa27"
-      by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
-      firmware_version: 3.13
-      model: PERC H710
-      size: 299439751168
-      storage: HDD
-  supported_job_types:
-    virtual: ivt
--- a/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml
@@ -10,6 +10,8 @@ queues:
 nodes:
  taurus-2:
    status: retired
+  taurus-12:
+    status: retired
  taurus-14:
    status: retired
  taurus-16:

--- a/input/grid5000/sites/lyon/networks/force10.yaml
+++ b/input/grid5000/sites/lyon/networks/force10.yaml
@@ -79,7 +79,6 @@ force10:
        9: taurus-9
        10: taurus-10
        11: taurus-11
-        12: taurus-12
        13: taurus-13
        15: taurus-15
        17: orion-1

--- a/input/grid5000/sites/lyon/pdus.yaml
+++ b/input/grid5000/sites/lyon/pdus.yaml
@@ -448,7 +448,6 @@ pdus:
      31: taurus-9
      32: taurus-10
      33: taurus-11
-      34: taurus-12
      35: taurus-13
      36: taurus-14
      37: taurus-15