diff --git a/Makefile b/Makefile index 5d5af3f..87bae0b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ serve: - bundle exec -- jekyll serve --host 0.0.0.0 + bundle exec -- jekyll serve --host 0.0.0.0 --port 8080 build: bundle exec -- jekyll build diff --git a/_data/navigation.yml b/_data/navigation.yml index b27ea5d..9a393d9 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -39,6 +39,10 @@ by-use: url: /by-use/macos-arm64 - title: FreeBSD-x86_64 url: /by-use/freebsd-x86_64 + - title: Windows-amd64 + url: /by-use/windows-amd64 + - title: OpenBSD-amd64 + url: /by-use/openbsd-amd64 by-location: - title: Locations diff --git a/_machines/arm64-jade-1.md b/_machines/arm64-jade-1.md deleted file mode 100644 index 7f98c0b..0000000 --- a/_machines/arm64-jade-1.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: arm64-jade-1 -ip: 145.40.81.195 -fqdn: arm64-jade-1.ocamllabs.io -manufacturer: Avantek -model: Ampere(TM) Mt Jade -os: Ubuntu 22.04 -threads: 160 -serial: B81030Z1000703900010N0SC -memory: 256GB -processor: 'Neoverse-N1' -location: Equinix -notes: Cluster worker -pool: linux-arm64 -disks: - - 2 x 900GB NVMe ---- -{% include details.html %} - diff --git a/_machines/bremusa.md b/_machines/bremusa.md index 32337a2..cf0becf 100644 --- a/_machines/bremusa.md +++ b/_machines/bremusa.md @@ -7,9 +7,8 @@ model: PowerEdge R630 serial: DLDZGL2 os: Ubuntu 22.04.3 LTS threads: 72 -notes: Benchmarking. /dev/sdb is unused location: Caelum -use: benchmarking +pool: openbsd-amd64 disks: - 400GB SSD - 400GB SSD diff --git a/_machines/c2-1.md b/_machines/c2-1.md index ebbcc2b..c0248ff 100644 --- a/_machines/c2-1.md +++ b/_machines/c2-1.md @@ -6,8 +6,7 @@ model: PowerEdge R6415 os: Ubuntu 22.04 threads: 48 location: Equinix -pool: linux-x86_64 -notes: Cluster worker +notes: Dune preview processor: 'AMD EPYC 7401P 24-Core Processor' disks: - 2 x 128GB SSD diff --git a/_machines/c2-2.md b/_machines/c2-2.md index c4c9043..7561dd6 100644 --- a/_machines/c2-2.md +++ b/_machines/c2-2.md @@ -1,13 +1,11 @@ --- name: c2-2 -ip: 136.144.58.181 -fqdn: c2-2.ocamllabs.io +fqdn: c2-2.equinix.ci.dev model: PowerEdge R6415 os: Ubuntu 22.04 threads: 48 location: Equinix -pool: linux-x86_64 -notes: Cluster worker +notes: opam2web / Docker registry processor: 'AMD EPYC 7401P 24-Core Processor' disks: - 2 x 128GB SSD diff --git a/_machines/c2-3.md b/_machines/c2-3.md index f3d0c60..777a49d 100644 --- a/_machines/c2-3.md +++ b/_machines/c2-3.md @@ -1,13 +1,11 @@ --- name: c2-3 -ip: 136.144.51.234 -fqdn: c2-3.ocamllabs.io +fqdn: c2-3.equinix.ci.dev model: PowerEdge R6415 os: Ubuntu 22.04 threads: 48 location: Equinix -pool: linux-x86_64 -notes: Cluster worker +notes: OCaml-CI, Prometheus, Grafana processor: 'AMD EPYC 7401P 24-Core Processor' disks: - 2 x 128GB SSD diff --git a/_machines/c2-4.md b/_machines/c2-4.md index 262e52c..848f248 100644 --- a/_machines/c2-4.md +++ b/_machines/c2-4.md @@ -1,13 +1,11 @@ --- name: c2-4 -ip: 147.75.199.25 -fqdn: c2-4.ocamllabs.io +fqdn: c2-4.equinix.ci.dev model: PowerEdge R6415 os: Ubuntu 22.04 threads: 48 location: Equinix -pool: linux-x86_64 -notes: Cluster worker +notes: opam-repo-ci processor: 'AMD EPYC 7401P 24-Core Processor' disks: - 2 x 128GB SSD diff --git a/_machines/odawa.md b/_machines/odawa.md index 0b9f9b9..71279f7 100644 --- a/_machines/odawa.md +++ b/_machines/odawa.md @@ -6,10 +6,10 @@ manufacturer: Dell model: PowerEdge R6525 serial: 47B6KH3 notes: Windows Base Image Builder -pool: windows-x86_64 +pool: windows-amd64 location: Caelum ip: 128.232.124.247 -os: Windows 2022 DC +os: Ubuntu 24.04 threads: 256 processor: 'AMD EPYC 7763 64-Core Processor' --- diff --git a/_machines/opam-2.md b/_machines/opam-2.md deleted file mode 100644 index 850d3db..0000000 --- a/_machines/opam-2.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -name: opam-2 -ip: 54.146.41.74 -fqdn: opam-2.ocaml.org -os: Ubuntu 20.04.3 -manufacturer: AWS -model: VM -location: AWS -threads: 2 -memory: 4GB -disks: - - 200GB -notes: staging.opam.ocaml.org ---- -{% include details.html %} - diff --git a/_machines/opam-3.md b/_machines/opam-3.md deleted file mode 100644 index 6f9ef16..0000000 --- a/_machines/opam-3.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -name: opam-3 -fqdn: opam-3.ocaml.org -ip: 54.224.129.120 -os: Ubuntu 20.04.3 -manufacturer: AWS -model: VM -threads: 2 -location: AWS -memory: 4GB -disks: - - 200GB -notes: ocurrent/opam.ocaml.org ---- -{% include details.html %} - diff --git a/_machines/x86-bm-c1.md b/_machines/x86-bm-c1.md new file mode 100644 index 0000000..194d059 --- /dev/null +++ b/_machines/x86-bm-c1.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c1 +fqdn: x86-bm-c1.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/_machines/x86-bm-c10.md b/_machines/x86-bm-c10.md new file mode 100644 index 0000000..baa9b1d --- /dev/null +++ b/_machines/x86-bm-c10.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c10 +fqdn: x86-bm-c10.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/_machines/x86-bm-c11.md b/_machines/x86-bm-c11.md new file mode 100644 index 0000000..85d5c45 --- /dev/null +++ b/_machines/x86-bm-c11.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c11 +fqdn: x86-bm-c11.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/_machines/x86-bm-c12.md b/_machines/x86-bm-c12.md new file mode 100644 index 0000000..9233306 --- /dev/null +++ b/_machines/x86-bm-c12.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c12 +fqdn: x86-bm-c12.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/_machines/x86-bm-c13.md b/_machines/x86-bm-c13.md new file mode 100644 index 0000000..6197b50 --- /dev/null +++ b/_machines/x86-bm-c13.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c13 +fqdn: x86-bm-c13.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/_machines/x86-bm-c14.md b/_machines/x86-bm-c14.md new file mode 100644 index 0000000..d3b5a88 --- /dev/null +++ b/_machines/x86-bm-c14.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c14 +fqdn: x86-bm-c14.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/_machines/x86-bm-c15.md b/_machines/x86-bm-c15.md new file mode 100644 index 0000000..a92c9ce --- /dev/null +++ b/_machines/x86-bm-c15.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c15 +fqdn: x86-bm-c15.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/_machines/x86-bm-c16.md b/_machines/x86-bm-c16.md new file mode 100644 index 0000000..1c53c7c --- /dev/null +++ b/_machines/x86-bm-c16.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c16 +fqdn: x86-bm-c16.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/_machines/x86-bm-c17.md b/_machines/x86-bm-c17.md new file mode 100644 index 0000000..29c6dfb --- /dev/null +++ b/_machines/x86-bm-c17.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c17 +fqdn: x86-bm-c17.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/_machines/x86-bm-c18.md b/_machines/x86-bm-c18.md new file mode 100644 index 0000000..0a55dd9 --- /dev/null +++ b/_machines/x86-bm-c18.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c18 +fqdn: x86-bm-c18.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/_machines/x86-bm-c19.md b/_machines/x86-bm-c19.md new file mode 100644 index 0000000..f784b6f --- /dev/null +++ b/_machines/x86-bm-c19.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c19 +fqdn: x86-bm-c19.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/_machines/x86-bm-c2.md b/_machines/x86-bm-c2.md new file mode 100644 index 0000000..7829173 --- /dev/null +++ b/_machines/x86-bm-c2.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c2 +fqdn: x86-bm-c2.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/_machines/x86-bm-c20.md b/_machines/x86-bm-c20.md new file mode 100644 index 0000000..a23eb97 --- /dev/null +++ b/_machines/x86-bm-c20.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c20 +fqdn: x86-bm-c20.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/_machines/x86-bm-c3.md b/_machines/x86-bm-c3.md new file mode 100644 index 0000000..3d17872 --- /dev/null +++ b/_machines/x86-bm-c3.md @@ -0,0 +1,16 @@ +--- +name: x86-bm-c3 +fqdn: x86-bm-c3.sw.ocaml.org +manufacturer: Dell +model: PowerEdge R720 +os: Ubuntu 22.04 +threads: 32 +memory: 256GB +location: Scaleway +pool: linux-x86_64 +notes: Cluster worker +processor: 'Intel(R) Xeon(R) CPU E5-2650 v2 @ 2.60GHz' +disks: + - 2 x 950GB SSD +--- +{% include details.html %} diff --git a/by-use/openbsd-amd64.md b/by-use/openbsd-amd64.md new file mode 100644 index 0000000..19b9148 --- /dev/null +++ b/by-use/openbsd-amd64.md @@ -0,0 +1,27 @@ +--- +title: OpenBSD-amd64 +--- + + + + + + + + + +{% assign lower_title = page.title | downcase %} +{% for item in site.machines %} +{% assign lower_pool = item.pool | downcase %} +{% if lower_pool == lower_title %} + + + + + + + +{% endif %} +{% endfor %} +
MachineModelOSThreadsLocation
{{item.name}}{{item.manufacturer}} {{item.model}}{{item.os}}{{item.threads}}{{item.location}}
+ diff --git a/by-use/windows-amd64.md b/by-use/windows-amd64.md new file mode 100644 index 0000000..51a7574 --- /dev/null +++ b/by-use/windows-amd64.md @@ -0,0 +1,27 @@ +--- +title: Windows-amd64 +--- + + + + + + + + + +{% assign lower_title = page.title | downcase %} +{% for item in site.machines %} +{% assign lower_pool = item.pool | downcase %} +{% if lower_pool == lower_title %} + + + + + + + +{% endif %} +{% endfor %} +
MachineModelOSThreadsLocation
{{item.name}}{{item.manufacturer}} {{item.model}}{{item.os}}{{item.threads}}{{item.location}}
+ diff --git a/machines.md b/machines.md index e691cd5..2f20fdb 100644 --- a/machines.md +++ b/machines.md @@ -25,7 +25,7 @@ title: Machines {% endfor %} -{% assign pools = "linux-x86_64,linux-ppc64,linux-arm64,windows-x86_64,linux-s390x,linux-riscv64,macos-x86_64,macos-arm64" | split: ',' %} +{% assign pools = "linux-x86_64,linux-ppc64,linux-arm64,windows-x86_64,linux-s390x,linux-riscv64,macos-x86_64,macos-arm64,windows-amd64,openbsd-amd64" | split: ',' %} {% for pool in pools %} # Worker Pool {{pool}}