Skip to content

Commit 87b425b

Browse files
authored
feat: bump slurm to 25.05.6 and 24.11.7 (#84)
1 parent c1a4914 commit 87b425b

File tree

7 files changed

+18
-17
lines changed

7 files changed

+18
-17
lines changed

.env.example

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66

77
# Slurm version (semantic version format)
88
# Supported versions: 25.05.x, 24.11.x
9-
# Default: 25.05.3
109
# This is used for:
1110
# - Downloading the Slurm tarball from schedmd.com
1211
# - Tagging the Docker image
1312
# - Selecting version-specific configuration files
14-
SLURM_VERSION=25.05.3
13+
SLURM_VERSION=25.05.6
1514

1615
# MySQL credentials
1716
# Default values shown below (suitable for local development/testing only)

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false # Allow all matrix jobs to complete independently
1616
matrix:
17-
slurm_version: ['25.05.3', '24.11.6']
17+
slurm_version: ['25.05.6', '24.11.7']
1818
runner: ['ubuntu-latest', 'ubuntu-24.04-arm']
1919
monitoring: ['disabled', 'enabled']
2020
include:

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
.DEFAULT_GOAL := help
55

66
# Supported Slurm versions
7-
SUPPORTED_VERSIONS := 24.11.6 25.05.3
7+
SUPPORTED_VERSIONS := 24.11.7 25.05.6
88
# Read default version from .env.example (source of truth)
99
DEFAULT_VERSION := $(shell grep '^SLURM_VERSION=' .env.example | cut -d= -f2)
1010

@@ -56,8 +56,8 @@ help: ## Show this help message
5656
@echo ""
5757
@echo "Examples:"
5858
@echo " make update-slurm FILES=\"slurm.conf slurmdbd.conf\""
59-
@echo " make set-version VER=24.11.6"
60-
@echo " make test-version VER=24.11.6"
59+
@echo " make set-version VER=24.11.7"
60+
@echo " make test-version VER=24.11.7"
6161
@echo ""
6262
@echo "Monitoring:"
6363
@echo " Enable: Set ELASTICSEARCH_HOST=http://elasticsearch:9200 in .env"

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ make up
4545
- **slurmctld** - Controller for job scheduling
4646
- **slurmrestd** - REST API daemon (HTTP/JSON access)
4747
- **c1, c2** - Compute nodes
48+
- **elasticsearch** - (optional) indexing jobs
49+
- **kibana** - (optional) visualization for elasticsearch
4850

4951
**Persistent volumes:**
5052

@@ -151,8 +153,8 @@ make rebuild
151153
```bash
152154
# Cross-platform build (uses QEMU emulation)
153155
docker buildx build --platform linux/arm64 \
154-
--build-arg SLURM_VERSION=25.05.3 \
155-
--load -t slurm-docker-cluster:25.05.3 .
156+
--build-arg SLURM_VERSION=25.05.6 \
157+
--load -t slurm-docker-cluster:25.05.6 .
156158
```
157159

158160
## 📚 Documentation

docker-compose.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ services:
2020
start_period: 30s
2121

2222
slurmdbd:
23-
image: slurm-docker-cluster:${SLURM_VERSION:-25.05.3}
23+
image: slurm-docker-cluster:${SLURM_VERSION:-25.05.6}
2424
build:
2525
context: .
2626
args:
27-
SLURM_VERSION: ${SLURM_VERSION:-25.05.3}
27+
SLURM_VERSION: ${SLURM_VERSION:-25.05.6}
2828
cache_from:
29-
- slurm-docker-cluster:${SLURM_VERSION:-25.05.3}
29+
- slurm-docker-cluster:${SLURM_VERSION:-25.05.6}
3030
command: ["slurmdbd"]
3131
container_name: slurmdbd
3232
hostname: slurmdbd
@@ -52,7 +52,7 @@ services:
5252
start_period: 20s
5353

5454
slurmctld:
55-
image: slurm-docker-cluster:${SLURM_VERSION:-25.05.3}
55+
image: slurm-docker-cluster:${SLURM_VERSION:-25.05.6}
5656
command: ["slurmctld"]
5757
container_name: slurmctld
5858
hostname: slurmctld
@@ -80,7 +80,7 @@ services:
8080
start_period: 20s
8181

8282
slurmrestd:
83-
image: slurm-docker-cluster:${SLURM_VERSION:-25.05.3}
83+
image: slurm-docker-cluster:${SLURM_VERSION:-25.05.6}
8484
command: ["slurmrestd"]
8585
container_name: slurmrestd
8686
hostname: slurmrestd
@@ -106,7 +106,7 @@ services:
106106
start_period: 20s
107107

108108
c1:
109-
image: slurm-docker-cluster:${SLURM_VERSION:-25.05.3}
109+
image: slurm-docker-cluster:${SLURM_VERSION:-25.05.6}
110110
command: ["slurmd"]
111111
container_name: c1
112112
hostname: c1
@@ -132,7 +132,7 @@ services:
132132
start_period: 20s
133133

134134
c2:
135-
image: slurm-docker-cluster:${SLURM_VERSION:-25.05.3}
135+
image: slurm-docker-cluster:${SLURM_VERSION:-25.05.6}
136136
command: ["slurmd"]
137137
container_name: c2
138138
hostname: c2

test_cluster.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ test_python_version() {
344344
get_api_version() {
345345
local slurm_version="$1"
346346

347-
# Extract major.minor version (e.g., "25.05" from "25.05.3")
347+
# Extract major.minor version (e.g., "25.05" from "25.05.x")
348348
local major_minor=$(echo "$slurm_version" | cut -d. -f1,2)
349349

350350
case "$major_minor" in

update_slurmfiles.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ -z "$SLURM_VERSION" ]; then
1313
exit 1
1414
fi
1515

16-
# Extract major.minor version (e.g., 25.05 from 25.05.3)
16+
# Extract major.minor version (e.g., 25.05 from 25.05.x)
1717
VERSION_DIR=$(echo "$SLURM_VERSION" | cut -d. -f1-2)
1818

1919
restart=false

0 commit comments

Comments
 (0)