From 5d86d74f28e8281a783b4fd555352d3ec21f99ae Mon Sep 17 00:00:00 2001
From: Mark Elvers <mark.elvers@tunbury.org>
Date: Mon, 6 Nov 2023 16:28:53 +0000
Subject: [PATCH] Repurpose spring.  Remove avsm machines

---
 _machines/aello.md    | 15 ---------------
 _machines/apache.md   | 19 -------------------
 _machines/cree.md     | 19 -------------------
 _machines/hipp.md     | 20 --------------------
 _machines/pima.md     | 19 -------------------
 _machines/sherwood.md | 12 ------------
 _machines/spring.md   |  8 ++++++--
 7 files changed, 6 insertions(+), 106 deletions(-)
 delete mode 100644 _machines/aello.md
 delete mode 100644 _machines/apache.md
 delete mode 100644 _machines/cree.md
 delete mode 100644 _machines/hipp.md
 delete mode 100644 _machines/pima.md
 delete mode 100644 _machines/sherwood.md

diff --git a/_machines/aello.md b/_machines/aello.md
deleted file mode 100644
index 8fc1f58..0000000
--- a/_machines/aello.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: aello
-ip:
-fqdn: aello.ocamllabs.io
-notes: Anil is using this for mulitcore hacking - ask in September 2022
-location: Caelum
-serial: DLDYGL2
-manufacturer: Dell
-model: PowerEdge R630
-processor: 'Intel(R) Xeon(R) CPU E5-2695 v4 @ 2.10GHz'
-threads: 72
-os: Ubuntu 20.04.1
----
-{% include details.html %} 
-
diff --git a/_machines/apache.md b/_machines/apache.md
deleted file mode 100644
index 1735b15..0000000
--- a/_machines/apache.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: apache
-ip: 128.232.124.234
-fqdn: apache.ocamllabs.io
-manufacturer: Dell
-model: PowerEdge R7425
-serial: 7NDNYQ2
-os: Ubuntu 22.04
-threads: 128
-location: Caelum
-notes: Cluster worker
-pool: linux-x86_64
-processor: 'AMD EPYC 7551 32-Core Processor'
-disks:
-  - 120GB SSD
-  - 1.5TB NVMe
----
-{% include details.html %} 
-
diff --git a/_machines/cree.md b/_machines/cree.md
deleted file mode 100644
index da2e25b..0000000
--- a/_machines/cree.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: cree
-ip: 128.232.124.236
-fqdn: cree.ocamllabs.io
-manufacturer: Dell
-model: PowerEdge R7425
-os: Ubuntu 22.04
-threads: 128
-location: Caelum
-notes: Cluster worker
-pool: linux-x86_64
-serial: 7NDJYQ2
-processor: 'AMD EPYC 7551 32-Core Processor'
-disks:
-  - 120GB SSD
-  - 1.5TB NVMe
----
-{% include details.html %} 
-
diff --git a/_machines/hipp.md b/_machines/hipp.md
deleted file mode 100644
index f9a573a..0000000
--- a/_machines/hipp.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: hipp
-ip: 128.232.124.201
-fqdn: hipp.ocamllabs.io
-manufacturer: Dell
-model: PowerEdge R630
-os: Ubuntu 22.04
-threads: 72
-memory: 512GB
-location: Caelum
-notes: Anil is using this for mulitcore hacking - ask in September 2022
-pool: linux-x86_64
-disks:
-  - 800GB SSD
-  - 1.6TB NVMe
-serial: DLDWGL2
-processor: 'Intel(R) Xeon(R) CPU E5-2695 v4 @ 2.10GHz'
----
-{% include details.html %} 
-
diff --git a/_machines/pima.md b/_machines/pima.md
deleted file mode 100644
index 14de9d8..0000000
--- a/_machines/pima.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: pima
-ip: 128.232.124.197
-fqdn: pima.ocamllabs.io
-manufacturer: Dell
-model: PowerEdge R7425
-os: Ubuntu 22.04
-threads: 128
-location: Caelum
-notes: Cluster worker
-pool: linux-x86_64
-serial: 7NDMYQ2
-processor: 'AMD EPYC 7551 32-Core Processor'
-disks:
-  - 120GB SSD
-  - 1.5TB NVMe
----
-{% include details.html %} 
-
diff --git a/_machines/sherwood.md b/_machines/sherwood.md
deleted file mode 100644
index 7a57dbb..0000000
--- a/_machines/sherwood.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: sherwood
-ip: 128.232.124.192
-fqdn: sherwood.ocamllabs.io
-model: Gigabyte R182-Z91-00
-os: Ubuntu 22.04
-threads: 256
-location: Caelum
-notes: avsm is using this with hipp and aello
----
-{% include details.html %} 
-
diff --git a/_machines/spring.md b/_machines/spring.md
index cad4dc3..acdf089 100644
--- a/_machines/spring.md
+++ b/_machines/spring.md
@@ -3,14 +3,18 @@ name: spring
 ip: 128.232.124.188
 fqdn: spring.caelum.ci.dev
 model: Super Server
-os: Ubuntu 20.04
+os: FreeBSD 13.2
 threads: 8
 location: Caelum
 use: benchmarking
-notes: Benchmarking Spare
+notes: FreeBSD worker + some user data in /home (check)
 serial: 0123456789
 processor: 'Intel(R) Xeon(R) Silver 4108 CPU @ 1.80GHz'
 ssh: mte24@spring.ocamllabs.io
+pool: freebsd-x86_64
+disks:
+  - 200GB SSD
+  - 1.0TB
 ---
 {% include details.html %}