From 6a1ac14dfca26252a683d6197e9a6564994812b9 Mon Sep 17 00:00:00 2001
From: EISENBART Theo <theo.eisenbart@inria.fr>
Date: Wed, 26 Feb 2025 13:30:29 +0100
Subject: [PATCH 1/5] [sophia][esterel6] Add new cluster esterel6
---
input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml b/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml
index a36710766dd..36f0fb0546e 100644
--- a/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml
@@ -9,6 +9,9 @@ queues:
- testing
nodes:
esterel6-1:
+ chassis:
+ manufactured_at: 2025-02-26
+ warranty_end: 2022-04-17
supported_job_types:
deploy: true
besteffort: true
--
GitLab
From 27fd8337045dd5928c1cdcc66e877274536268d1 Mon Sep 17 00:00:00 2001
From: EISENBART Theo <theo.eisenbart@inria.fr>
Date: Tue, 18 Mar 2025 09:16:29 +0100
Subject: [PATCH 2/5] [sophia][esterel6] Add disk path
---
.../sites/sophia/clusters/esterel6/nodes/esterel6-1.json | 5 +++++
input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml | 1 +
2 files changed, 6 insertions(+)
diff --git a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
index 7af43c11966..a9025826816 100644
--- a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
@@ -232,9 +232,14 @@
},
"storage_devices": [
{
+<<<<<<< HEAD
"by_id": "/dev/disk/by-id/wwn-0x61866da0a594e5002f66bf5e14ffcf3a",
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
"firmware_version": 4.3,
+=======
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
+>>>>>>> 6a301de672 ([sophia][esterel6] Add disk path)
"id": "disk0",
"interface": "SAS",
"model": "PERC H730 Adp",
diff --git a/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml b/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml
index 36f0fb0546e..3abc3fdc4d5 100644
--- a/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml
@@ -42,6 +42,7 @@ nodes:
pci-0000:03:00.0-scsi-0:2:0:0:
id: disk0
interface: SAS
+ by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" # this path will have to change later.
software:
standard-environment: debian11-x64-std
management_tools:
--
GitLab
From 78478efecb24876da9542df0999658caf2845424 Mon Sep 17 00:00:00 2001
From: EISENBART Theo <theo.eisenbart@inria.fr>
Date: Wed, 19 Mar 2025 14:56:48 +0100
Subject: [PATCH 3/5] [sophia][esterel6] G5K import
---
input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml b/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml
index 3abc3fdc4d5..a36710766dd 100644
--- a/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml
@@ -9,9 +9,6 @@ queues:
- testing
nodes:
esterel6-1:
- chassis:
- manufactured_at: 2025-02-26
- warranty_end: 2022-04-17
supported_job_types:
deploy: true
besteffort: true
@@ -42,7 +39,6 @@ nodes:
pci-0000:03:00.0-scsi-0:2:0:0:
id: disk0
interface: SAS
- by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" # this path will have to change later.
software:
standard-environment: debian11-x64-std
management_tools:
--
GitLab
From 4814fc34695a0907ba973798498a6584feaf112e Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Wed, 19 Mar 2025 15:07:56 +0100
Subject: [PATCH 4/5] [sophia][esterel6] fix merge error in json
---
.../sites/sophia/clusters/esterel6/nodes/esterel6-1.json | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
index a9025826816..8450ffea025 100644
--- a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
@@ -232,14 +232,9 @@
},
"storage_devices": [
{
-<<<<<<< HEAD
"by_id": "/dev/disk/by-id/wwn-0x61866da0a594e5002f66bf5e14ffcf3a",
"by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
"firmware_version": 4.3,
-=======
- "by_id": "",
- "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
->>>>>>> 6a301de672 ([sophia][esterel6] Add disk path)
"id": "disk0",
"interface": "SAS",
"model": "PERC H730 Adp",
@@ -260,4 +255,4 @@
},
"type": "node",
"uid": "esterel6-1"
-}
\ No newline at end of file
+}
--
GitLab
From 3b9666a2b2d7d6c684f84c76521894d2b25e8e6b Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Fri, 4 Apr 2025 11:53:06 +0200
Subject: [PATCH 5/5] [sophia][esterel6] BIOS and BMC updates
---
.../sites/sophia/clusters/esterel6/nodes/esterel6-1.json | 8 ++++----
.../sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
index 8450ffea025..767b7a4f4e3 100644
--- a/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.json
@@ -7,11 +7,11 @@
"platform_type": "x86_64"
},
"bios": {
- "release_date": "10/18/2023",
+ "release_date": "02/22/2024",
"vendor": "Dell Inc.",
- "version": "2.18.2"
+ "version": "2.19.0"
},
- "bmc_version": "2.85.85.85",
+ "bmc_version": "2.86.86.86",
"chassis": {
"manufactured_at": "2017-04-18",
"manufacturer": "Dell Inc.",
@@ -255,4 +255,4 @@
},
"type": "node",
"uid": "esterel6-1"
-}
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml b/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml
index 0c30192c0a5..8df6aa2427d 100644
--- a/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel6/nodes/esterel6-1.yaml
@@ -8,10 +8,10 @@ esterel6-1:
nb_threads: 48
platform_type: x86_64
bios:
- release_date: 10/18/2023
+ release_date: 02/22/2024
vendor: Dell Inc.
- version: 2.18.2
- bmc_version: 2.85.85.85
+ version: 2.19.0
+ bmc_version: 2.86.86.86
chassis:
manufacturer: Dell Inc.
name: PowerEdge T630
--
GitLab