Skip to content

Commit

Permalink
Update EL tests CentOS 7 -> Rocky 8, bullseye -> bookworm, drop unsup…
Browse files Browse the repository at this point in the history
…ported Slurm versions (#87)

Update tests CentOS 7 -> Rocky 8, bullseye -> bookworm, drop unsupported Slurm versions
  • Loading branch information
natefoo authored Oct 9, 2024
1 parent be50785 commit 2576a7e
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ ARG install_cmd
ARG uid
ARG gid
ARG version
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; }
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; }
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; }
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; }
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
RUN getent group $gid || groupadd -g $gid drmaa
RUN mkdir -m 1777 /slurm && useradd -u $uid -g $gid -m -d /drmaa drmaa
Expand Down
4 changes: 2 additions & 2 deletions .ci/runslurm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ case $ID in
su - mysql -s /bin/sh -c /usr/sbin/mysqld &
sock=/var/run/mysqld/mysqld.sock
;;
centos)
/usr/libexec/mariadb-prepare-db-dir mariadb.service
rocky)
/usr/libexec/mysql-prepare-db-dir mariadb.service
/usr/bin/mysqld_safe --basedir=/usr &
#/usr/libexec/mariadb-wait-ready $!
sock=/var/lib/mysql/mysql.sock
Expand Down
2 changes: 1 addition & 1 deletion .ci/slurm.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ SlurmctldPidFile=/slurm/slurmctld.pid
SlurmdPidFile=/slurm/slurmd.pid
SlurmdSpoolDir=/slurm/spool
StateSaveLocation=/slurm/save
FastSchedule=1
SchedulerType=sched/builtin
ProctrackType=proctrack/linuxproc
NodeName=localhost CPUs=1 State=UNKNOWN
AccountingStorageType=accounting_storage/slurmdbd
AccountingStorageHost=localhost
AccountingStoragePort=6819
MinJobAge=10
JobAcctGatherType=jobacct_gather/none
PartitionName=debug Nodes=localhost Default=YES MaxTime=INFINITE State=UP
26 changes: 10 additions & 16 deletions .github/workflows/slurm-drmaa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,23 @@ jobs:
matrix:
include:
- os: ubuntu-latest
docker_image: centos:7
slurm_version: 18.08
- os: ubuntu-latest
docker_image: centos:7
slurm_version: 19.05
- os: ubuntu-latest
docker_image: centos:7
slurm_version: 20.02
- os: ubuntu-latest
docker_image: centos:7
docker_image: rockylinux:8
slurm_version: 20.11
- os: ubuntu-latest
docker_image: centos:7
docker_image: rockylinux:8
slurm_version: 21.08
- os: ubuntu-latest
docker_image: centos:7
docker_image: rockylinux:8
slurm_version: 22.05
- os: ubuntu-latest
docker_image: centos:7
docker_image: rockylinux:8
slurm_version: 23.02
- os: ubuntu-latest
docker_image: debian:bullseye
slurm_version: apt
docker_image: rockylinux:8
slurm_version: 23.11
- os: ubuntu-latest
docker_image: debian:bookworm
slurm_version: 22.05
env:
DOCKER_IMAGE: ${{ matrix.docker_image }}
SLURM_VERSION: ${{ matrix.slurm_version }}
Expand Down Expand Up @@ -67,6 +61,6 @@ jobs:
- name: Partition info
run: docker exec $cid scontrol show partition debug
- name: Log failure
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
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
- name: Run tests
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 comments on commit 2576a7e

Please sign in to comment.