Skip to content

Commit 2576a7e

Browse files
authored
Update EL tests CentOS 7 -> Rocky 8, bullseye -> bookworm, drop unsupported Slurm versions (#87)
Update tests CentOS 7 -> Rocky 8, bullseye -> bookworm, drop unsupported Slurm versions
1 parent be50785 commit 2576a7e

4 files changed

Lines changed: 15 additions & 21 deletions

File tree

.ci/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ARG install_cmd
44
ARG uid
55
ARG gid
66
ARG version
7-
RUN command -v apt-get || { curl -o /etc/yum.repos.d/slurm.repo https://depot.galaxyproject.org/yum/package/slurm/$version/slurm.repo && yum install -y '@development tools' mariadb-server slurm slurm-devel slurm-slurmctld slurm-slurmd slurm-slurmdbd && useradd -m -d /home/slurm slurm; }
8-
RUN command -v yum || { apt-get -qq update && apt-get install --no-install-recommends -y build-essential mariadb-server slurm-wlm slurmdbd libslurm-dev libslurm-dev; }
7+
RUN command -v apt-get || { curl -o /etc/yum.repos.d/slurm.repo https://depot.galaxyproject.org/yum/package/slurm/$version/slurm.repo && dnf group install -y "Development Tools" && dnf install -y mariadb-server slurm slurm-devel slurm-slurmctld slurm-slurmd slurm-slurmdbd && useradd -m -d /home/slurm slurm; }
8+
RUN command -v dnf || { apt-get -qq update && apt-get install --no-install-recommends -y build-essential mariadb-server slurm-wlm slurmdbd libslurm-dev libslurm-dev; }
99
RUN mkdir -p /etc/munge /var/run/munge && [ -f /etc/munge/munge.key ] || dd if=/dev/urandom bs=1 count=1024 >/etc/munge/munge.key
1010
RUN getent group $gid || groupadd -g $gid drmaa
1111
RUN mkdir -m 1777 /slurm && useradd -u $uid -g $gid -m -d /drmaa drmaa

.ci/runslurm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ case $ID in
1111
su - mysql -s /bin/sh -c /usr/sbin/mysqld &
1212
sock=/var/run/mysqld/mysqld.sock
1313
;;
14-
centos)
15-
/usr/libexec/mariadb-prepare-db-dir mariadb.service
14+
rocky)
15+
/usr/libexec/mysql-prepare-db-dir mariadb.service
1616
/usr/bin/mysqld_safe --basedir=/usr &
1717
#/usr/libexec/mariadb-wait-ready $!
1818
sock=/var/lib/mysql/mysql.sock

.ci/slurm.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ SlurmctldPidFile=/slurm/slurmctld.pid
66
SlurmdPidFile=/slurm/slurmd.pid
77
SlurmdSpoolDir=/slurm/spool
88
StateSaveLocation=/slurm/save
9-
FastSchedule=1
109
SchedulerType=sched/builtin
1110
ProctrackType=proctrack/linuxproc
1211
NodeName=localhost CPUs=1 State=UNKNOWN
1312
AccountingStorageType=accounting_storage/slurmdbd
1413
AccountingStorageHost=localhost
1514
AccountingStoragePort=6819
1615
MinJobAge=10
16+
JobAcctGatherType=jobacct_gather/none
1717
PartitionName=debug Nodes=localhost Default=YES MaxTime=INFINITE State=UP

.github/workflows/slurm-drmaa.yaml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,23 @@ jobs:
1010
matrix:
1111
include:
1212
- os: ubuntu-latest
13-
docker_image: centos:7
14-
slurm_version: 18.08
15-
- os: ubuntu-latest
16-
docker_image: centos:7
17-
slurm_version: 19.05
18-
- os: ubuntu-latest
19-
docker_image: centos:7
20-
slurm_version: 20.02
21-
- os: ubuntu-latest
22-
docker_image: centos:7
13+
docker_image: rockylinux:8
2314
slurm_version: 20.11
2415
- os: ubuntu-latest
25-
docker_image: centos:7
16+
docker_image: rockylinux:8
2617
slurm_version: 21.08
2718
- os: ubuntu-latest
28-
docker_image: centos:7
19+
docker_image: rockylinux:8
2920
slurm_version: 22.05
3021
- os: ubuntu-latest
31-
docker_image: centos:7
22+
docker_image: rockylinux:8
3223
slurm_version: 23.02
3324
- os: ubuntu-latest
34-
docker_image: debian:bullseye
35-
slurm_version: apt
25+
docker_image: rockylinux:8
26+
slurm_version: 23.11
27+
- os: ubuntu-latest
28+
docker_image: debian:bookworm
29+
slurm_version: 22.05
3630
env:
3731
DOCKER_IMAGE: ${{ matrix.docker_image }}
3832
SLURM_VERSION: ${{ matrix.slurm_version }}
@@ -67,6 +61,6 @@ jobs:
6761
- name: Partition info
6862
run: docker exec $cid scontrol show partition debug
6963
- name: Log failure
70-
run: if [ $slurmctld_attempt -eq 29 ]; then echo "[slurmdbd.log]"; cat .ci/slurmdbd.log; echo "[slurmctld.log]"; cat .ci/slurmctld.log; echo "[slurmd.log]"; cat .ci/slurmd.log; exit 1; fi
64+
run: if [ $slurmctld_attempt -eq 29 ]; then echo "[slurmdbd.log]"; cat .ci/slurmdbd.log; echo "[slurmctld.log]"; cat .ci/slurmctld.log; echo "[slurmd.log]"; cat .ci/slurmd.log; echo "[docker logs]"; docker logs $cid; exit 1; fi
7165
- name: Run tests
7266
run: docker exec --workdir $(pwd) $cid make check || { echo "[test-suite.log]"; cat test/test-suite.log; echo "[functional-basic.log]"; cat test/functional-basic.log; exit 1; }

0 commit comments

Comments
 (0)