From 43871bca25d1cb2df8fa980d9ef8f52e3343d62f Mon Sep 17 00:00:00 2001
From: BERARD Benjamin <benjamin.berard@inria.fr>
Date: Tue, 30 Jun 2020 22:43:36 +0200
Subject: [PATCH] [luxembourg] granduc-3 is retired

---
 .../clusters/granduc/nodes/granduc-3.json     | 264 ------------------
 .../clusters/granduc/granduc_retired.yaml.erb |   2 +-
 2 files changed, 1 insertion(+), 265 deletions(-)
 delete mode 100644 data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json

diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
deleted file mode 100644
index 3ab5c6e5fd0..00000000000
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
-  "architecture": {
-    "cpu_core_numbering": "round-robin",
-    "nb_cores": 8,
-    "nb_procs": 2,
-    "nb_threads": 8,
-    "platform_type": "x86_64"
-  },
-  "bios": {
-    "release_date": "10/30/2010",
-    "vendor": "Dell Inc.",
-    "version": "2.7.0"
-  },
-  "bmc_version": "1.77",
-  "chassis": {
-    "manufacturer": "Dell Inc.",
-    "name": "PowerEdge 1950",
-    "serial": "3R2593J"
-  },
-  "exotic": false,
-  "kavlan": {
-    "eth0": {
-      "kavlan-1": "192.168.192.3",
-      "kavlan-11": "10.7.237.3",
-      "kavlan-12": "10.11.237.3",
-      "kavlan-13": "10.15.237.3",
-      "kavlan-14": "10.19.237.3",
-      "kavlan-16": "10.27.237.3",
-      "kavlan-18": "10.35.237.3",
-      "kavlan-2": "192.168.208.3",
-      "kavlan-20": "10.43.237.3",
-      "kavlan-21": "10.47.237.3",
-      "kavlan-3": "192.168.224.3",
-      "kavlan-4": "10.40.0.3",
-      "kavlan-5": "10.40.64.3",
-      "kavlan-6": "10.40.128.3",
-      "kavlan-7": "10.40.192.3",
-      "kavlan-8": "10.41.0.3",
-      "kavlan-9": "10.41.64.3"
-    },
-    "eth1": {
-      "kavlan-1": "192.168.193.3",
-      "kavlan-11": "10.7.237.103",
-      "kavlan-12": "10.11.237.103",
-      "kavlan-13": "10.15.237.103",
-      "kavlan-14": "10.19.237.103",
-      "kavlan-16": "10.27.237.103",
-      "kavlan-18": "10.35.237.103",
-      "kavlan-2": "192.168.209.3",
-      "kavlan-20": "10.43.237.103",
-      "kavlan-21": "10.47.237.103",
-      "kavlan-3": "192.168.225.3",
-      "kavlan-4": "10.40.1.3",
-      "kavlan-5": "10.40.65.3",
-      "kavlan-6": "10.40.129.3",
-      "kavlan-7": "10.40.193.3",
-      "kavlan-8": "10.41.1.3",
-      "kavlan-9": "10.41.65.3"
-    }
-  },
-  "kavlan6": {
-    "eth0": {
-      "kavlan-1": "2001:660:4406:381:1::3",
-      "kavlan-11": "2001:660:4406:38b:1::3",
-      "kavlan-12": "2001:660:4406:38c:1::3",
-      "kavlan-13": "2001:660:4406:38d:1::3",
-      "kavlan-14": "2001:660:4406:38e:1::3",
-      "kavlan-16": "2001:660:4406:390:1::3",
-      "kavlan-18": "2001:660:4406:392:1::3",
-      "kavlan-2": "2001:660:4406:382:1::3",
-      "kavlan-20": "2001:660:4406:394:1::3",
-      "kavlan-21": "2001:660:4406:395:1::3",
-      "kavlan-3": "2001:660:4406:383:1::3",
-      "kavlan-4": "2001:660:4406:384:1::3",
-      "kavlan-5": "2001:660:4406:385:1::3",
-      "kavlan-6": "2001:660:4406:386:1::3",
-      "kavlan-7": "2001:660:4406:387:1::3",
-      "kavlan-8": "2001:660:4406:388:1::3",
-      "kavlan-9": "2001:660:4406:389:1::3"
-    },
-    "eth1": {
-      "kavlan-1": "2001:660:4406:381:1:1::3",
-      "kavlan-11": "2001:660:4406:38b:1:1::3",
-      "kavlan-12": "2001:660:4406:38c:1:1::3",
-      "kavlan-13": "2001:660:4406:38d:1:1::3",
-      "kavlan-14": "2001:660:4406:38e:1:1::3",
-      "kavlan-16": "2001:660:4406:390:1:1::3",
-      "kavlan-18": "2001:660:4406:392:1:1::3",
-      "kavlan-2": "2001:660:4406:382:1:1::3",
-      "kavlan-20": "2001:660:4406:394:1:1::3",
-      "kavlan-21": "2001:660:4406:395:1:1::3",
-      "kavlan-3": "2001:660:4406:383:1:1::3",
-      "kavlan-4": "2001:660:4406:384:1:1::3",
-      "kavlan-5": "2001:660:4406:385:1:1::3",
-      "kavlan-6": "2001:660:4406:386:1:1::3",
-      "kavlan-7": "2001:660:4406:387:1:1::3",
-      "kavlan-8": "2001:660:4406:388:1:1::3",
-      "kavlan-9": "2001:660:4406:389:1:1::3"
-    }
-  },
-  "main_memory": {
-    "ram_size": 17179869184
-  },
-  "monitoring": {
-    "wattmeter": "false"
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.3",
-      "ip6": "2001:660:4406:300:1::3",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:0e:83",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": true,
-      "name": "eno1",
-      "network_address": "granduc-3.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet2/3",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "bnx2",
-      "enabled": true,
-      "firmware_version": "6.4.5 bc 5.0.7 UMP 1.1.9",
-      "interface": "Ethernet",
-      "ip": "172.16.176.103",
-      "ip6": "2001:660:4406:300:1:1::3",
-      "kavlan": true,
-      "mac": "00:19:b9:f2:0e:85",
-      "management": false,
-      "model": "NetXtreme II BCM5708 Gigabit Ethernet",
-      "mountable": true,
-      "mounted": false,
-      "name": "eno2",
-      "network_address": "granduc-3-eth1.luxembourg.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet1/26",
-      "vendor": "Broadcom"
-    },
-    {
-      "bridged": false,
-      "device": "eth2",
-      "driver": "ixgbe",
-      "enabled": true,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "ip": "172.16.176.203",
-      "ip6": "2001:660:4406:300:1:2::3",
-      "kavlan": false,
-      "mac": "00:1b:21:3c:87:cb",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": true,
-      "mounted": false,
-      "name": "enp13s0f0",
-      "network_address": "granduc-3-eth2.luxembourg.grid5000.fr",
-      "rate": 10000000000,
-      "switch": "ul-grid5000-sw02",
-      "switch_port": "Ethernet1/4",
-      "vendor": "Intel"
-    },
-    {
-      "bridged": false,
-      "device": "eth3",
-      "driver": "ixgbe",
-      "enabled": false,
-      "firmware_version": "0xc7390000",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "00:1b:21:3c:87:ca",
-      "management": false,
-      "model": "82598EB 10-Gigabit AF Dual Port Network Connection",
-      "mountable": false,
-      "mounted": false,
-      "name": "enp13s0f1",
-      "vendor": "Intel"
-    },
-    {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.176.3",
-      "kavlan": false,
-      "mac": "00:1c:23:d6:c3:0a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "granduc-3-bmc.luxembourg.grid5000.fr",
-      "switch": "gw-luxembourg"
-    }
-  ],
-  "operating_system": {
-    "cstate_driver": "none",
-    "cstate_governor": "menu",
-    "ht_enabled": false,
-    "pstate_driver": "none",
-    "pstate_governor": "none",
-    "turboboost_enabled": false
-  },
-  "performance": {
-    "core_flops": 6409000000.0,
-    "node_flops": 44070000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 32768,
-    "cache_l1i": 32768,
-    "cache_l2": 4194304,
-    "cache_l3": 0,
-    "clock_speed": 2000000000,
-    "ht_capable": true,
-    "instruction_set": "x86-64",
-    "microarchitecture": "Clovertown",
-    "microcode": "0xbc",
-    "model": "Intel Xeon",
-    "other_description": "Intel(R) Xeon(R) CPU           L5335  @ 2.00GHz",
-    "vendor": "Intel",
-    "version": "L5335"
-  },
-  "sensors": {
-  },
-  "software": {
-    "forced-deployment-timestamp": 202004301056,
-    "postinstall-version": "1.2020061100",
-    "standard-environment": "debian10-x64-std"
-  },
-  "storage_devices": [
-    {
-      "by_id": "/dev/disk/by-id/wwn-0x5000c5000ec50793",
-      "by_path": "/dev/disk/by-path/pci-0000:02:08.0-sas-phy0-lun-0",
-      "device": "sda",
-      "firmware_version": "S22A",
-      "interface": "SAS",
-      "model": "ST9146802SS",
-      "size": 146815733760,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "max_walltime": 0,
-    "queues": [
-      "default",
-      "admin"
-    ],
-    "virtual": "ivt"
-  },
-  "type": "node",
-  "uid": "granduc-3"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_retired.yaml.erb b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_retired.yaml.erb
index 356f3f98cf6..4665cae20d9 100644
--- a/input/grid5000/sites/luxembourg/clusters/granduc/granduc_retired.yaml.erb
+++ b/input/grid5000/sites/luxembourg/clusters/granduc/granduc_retired.yaml.erb
@@ -1,5 +1,5 @@
 nodes:
-<% [ 1, 5, 7, 8, 10, 11, 13, 14, 17, 19, 22 ].each { |i| %>
+<% [ 1, 3, 5, 7, 8, 10, 11, 13, 14, 17, 19, 22 ].each { |i| %>
   granduc-<%= i %>:
     status: retired
 <% } %>
-- 
GitLab