Bug 289656 - sysutils/slurm-wlm: track update to latest upstream release
Summary: sysutils/slurm-wlm: track update to latest upstream release
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vladimir Druzenko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2025-09-17 00:07 UTC by Generic Rikka
Modified: 2025-11-22 18:57 UTC (History)
1 user (show)

See Also:


Attachments
Upgrade sysutils/slurm-wlm from 23.11.7 to 25.05.3 (109.13 KB, patch)
2025-10-07 01:15 UTC, Generic Rikka
rikka.goering: maintainer-approval+
Details | Diff
Upgrade sysutils/slurm-wlm from 23.11.7 to 25.05.3 (102.50 KB, patch)
2025-10-08 01:23 UTC, Generic Rikka
rikka.goering: maintainer-approval+
Details | Diff
Upgrade sysutils/slurm-wlm from 23.11.7 to 25.05.3 (109.70 KB, patch)
2025-10-13 00:53 UTC, Generic Rikka
rikka.goering: maintainer-approval+
Details | Diff
Upgrade sysutils/slurm-wlm from 23.11.7 to 25.05.3 (106.22 KB, patch)
2025-10-18 01:16 UTC, Generic Rikka
rikka.goering: maintainer-approval+
Details | Diff
Upgrade sysutils/slurm-wlm from 23.11.7 to 25.11.0 (129.24 KB, patch)
2025-11-07 07:33 UTC, Generic Rikka
rikka.goering: maintainer-approval+
Details | Diff
v4 (85.51 KB, patch)
2025-11-22 14:28 UTC, Vladimir Druzenko
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Generic Rikka 2025-09-17 00:07:20 UTC
This issue tracks updating sysutils/slurm-wlm to the most recent upstream release.

The port is currently behind upstream. I plan to work on the update after the
open FreeBSD issues with Slurm are resolved (bug #289141 and bug #289394).
This ticket serves as documentation and coordination so that committers and
users are aware of the planned update.
Comment 1 Generic Rikka 2025-09-25 01:58:45 UTC
Upstream has addressed several issues we previously had to patch locally, so my next priority for this port is updating it to the latest release.

Sorry if I seem a bit quiet at the moment - I’m currently focusing on setting up testing and build infrastructure to support this update (and the broader HPC ports work). That will take a bit of time, but once it’s in place it should make future updates smoother and more reliable.
Comment 2 Generic Rikka 2025-10-02 00:06:17 UTC
Just a quick update: I’ve successfully built sysutils/slurm-wlm on version 25.05.3.

The next steps are resolving plist differences and rebasing the remaining FreeBSD-specific patches to ensure the port runs cleanly with the new release.

This is mainly a short heads-up to confirm that work on the update is ongoing and progressing.
Comment 3 Generic Rikka 2025-10-07 01:15:59 UTC
Created attachment 264361 [details]
Upgrade sysutils/slurm-wlm from 23.11.7 to 25.05.3

This patch updates sysutils/slurm-wlm to Slurm 25.05.3.

Upstream 25.05 introduces native support for disabling cgroups via configuration, removing the need for several of our previous BSD-specific workarounds.
As a result, all FreeBSD-specific patches were reviewed, and most of the mechanical ones (path rewrites, header fixes, etc.) were dropped since they are now handled either by upstream or via REINPLACE_CMD.

Summary of changes:

DISTVERSION → 25.05.3, reset PORTREVISION

Refreshed distinfo

Simplified patch set — dropped legacy FreeBSD patches now obsolete

Verified pkg-plist

Confirmed cgroup disabling via config (CgroupPlugin=disabled)

QA:

Built and staged successfully on FreeBSD 14.3-RELEASE amd64

Passed poudriere testport, stage-qa, check-plist, portfmt, portclippy, and portlint

Runtime-tested with slurmd -C, srun, and squeue

Attached build log: build-14_3-amd64.log (from internal GitLab CI matrix)

If no objections arise, this should be safe for commit.

Approved by: (maintainer)
MFH: No
Comment 4 Generic Rikka 2025-10-07 01:22:01 UTC
The full build and QA logs turned out to be too large to attach directly here, so I’ve published them on our internal GitLab CI pipeline instead:
https://code.kavocado.net/freebsd-hpc/slurm-wlm/-/pipelines/90

The pipeline includes:
- poudriere testport on FreeBSD 14.3-RELEASE amd64
- stage-qa, check-plist, and package
- portfmt, portclippy, and portlint

All tests passed successfully.

Because this update spans a major upstream version jump (23.11 -> 25.05), I also created a Phabricator review for additional visibility:
Differential Review: https://reviews.freebsd.org/D52949

The patch here and the one on the review are identical.
Once the review is accepted, I’ll update this issue accordingly.
Comment 5 Generic Rikka 2025-10-08 01:23:20 UTC
Created attachment 264393 [details]
Upgrade sysutils/slurm-wlm from 23.11.7 to 25.05.3

Updated patch according to review feedback.
Comment 6 Generic Rikka 2025-10-13 00:53:09 UTC
Created attachment 264512 [details]
Upgrade sysutils/slurm-wlm from 23.11.7 to 25.05.3
Comment 7 Generic Rikka 2025-10-18 01:16:58 UTC
Created attachment 264666 [details]
Upgrade sysutils/slurm-wlm from 23.11.7 to 25.05.3

Sorry, I almost forgot to send an updated patch, matching the current review status!
Comment 8 Generic Rikka 2025-11-07 07:33:41 UTC
Created attachment 265228 [details]
Upgrade sysutils/slurm-wlm from 23.11.7 to 25.11.0

SchedMD just released version 25.11. 

Upstream adopted a FreeBSD-reported linker crash workaround into 25.11.0, eliminating the need for several local patches.
Comment 9 Vladimir Druzenko freebsd_committer freebsd_triage 2025-11-22 14:28:18 UTC
Created attachment 265570 [details]
v4

A lot of things had to be corrected.
Comment 10 Generic Rikka 2025-11-22 15:06:40 UTC
Thanks a lot for picking this up and pushing it over the finish line!

I’ve gone through your updated patch and everything looks good to me. I especially appreciate how thoroughly you polished the port framework details; I’ve definitely learned a few FreeBSD-isms from this review that I’ll apply to future work.

Given the size of this update, and how quickly SchedMD has been pushing out new Slurm releases while we were iterating on it, I’m really happy with where this landed. From my side this is ready to go.

Thanks again for the detailed review and for keeping my authorship/maintainer credit.

Best regards,
Rikka
Comment 11 commit-hook freebsd_committer freebsd_triage 2025-11-22 18:55:59 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=11a4b5530f84b2397b1bcd83f01a519f9bd4c125

commit 11a4b5530f84b2397b1bcd83f01a519f9bd4c125
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-11-22 18:48:25 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-11-22 18:52:26 +0000

    net/openmpi4: Bump after update sysutils/slurm-wlm, improve port

    - Replace PORTVERSION with DISTVERSION.
    - Fix warnings from portclippy.
    - Refresh patches.

    PR:     289656

 net/openmpi4/Makefile                              | 32 ++++++++++------------
 .../patch-ompi_mca_sharedfp_sm_sharedfp__sm.h      |  4 +--
 ..._pmix3x_pmix_src_mca_pshmem_mmap_pshmem__mmap.c |  6 ++--
 3 files changed, 20 insertions(+), 22 deletions(-)
Comment 12 commit-hook freebsd_committer freebsd_triage 2025-11-22 18:57:02 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1536bac0dd26d81e315652929b8bfaff9c136089

commit 1536bac0dd26d81e315652929b8bfaff9c136089
Author:     Generic Rikka <rikka.goering@outlook.de>
AuthorDate: 2025-11-22 16:12:47 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-11-22 18:52:26 +0000

    sysutils/slurm-wlm: Update 23.11.7 => 25.11.0

    Changelogs:
    https://github.com/SchedMD/slurm/blob/slurm-25.11/CHANGELOG/slurm-23.11.md
    https://github.com/SchedMD/slurm/blob/slurm-25.11/CHANGELOG/slurm-24.05.md
    https://github.com/SchedMD/slurm/blob/slurm-25.11/CHANGELOG/slurm-24.11.md
    https://github.com/SchedMD/slurm/blob/slurm-25.11/CHANGELOG/slurm-25.05.md
    https://github.com/SchedMD/slurm/blob/slurm-25.11/CHANGELOG/slurm-25.11.md

    PR:     289656 289141 289394

 sysutils/slurm-wlm/Makefile                        | 177 ++++++---------
 sysutils/slurm-wlm/distinfo                        |   6 +-
 sysutils/slurm-wlm/files/patch-configure (gone)    | 251 ---------------------
 .../files/patch-etc_slurm.conf.example (gone)      | 116 ----------
 .../files/patch-src_common_callerid.h (gone)       |  10 -
 .../files/patch-src_common_conmgr.c (gone)         |  49 ----
 .../slurm-wlm/files/patch-src_common_net.c (gone)  |  68 ------
 .../files/patch-src_common_sack__api.c (gone)      |  28 ---
 ...tch-src_common_slurm__protocol__socket.c (gone) |  98 --------
 .../files/patch-src_common_stepd__api.c (gone)     |  36 ---
 .../files/patch-src_common_xsystemd.c (gone)       |  25 --
 .../files/patch-src_interfaces_cgroup.c (gone)     |  18 --
 ...ch-src_plugins_auth_slurm_net__aliases.c (gone) |  13 --
 .../patch-src_plugins_auth_slurm_sack.c (gone)     |  17 --
 ...__defaults_cli__filter__user__defaults.c (gone) |  10 -
 ..._container_tmpfs_job__container__tmpfs.c (gone) |  11 -
 ...ins_jobacct__gather_common_common__jag.c (gone) |  85 -------
 ...ins_mpi_cray__shasta_mpi__cray__shasta.c (gone) |  10 -
 .../patch-src_plugins_task_Makefile.in (gone)      |  11 -
 .../patch-src_plugins_task_pgid_Makefile.in (gone) |  97 --------
 ...patch-src_plugins_task_pgid_task__pgid.c (gone) | 155 -------------
 .../files/patch-src_scrun_anchor.c (gone)          |  27 ---
 .../files/patch-src_scrun_commands.c (gone)        |  13 --
 .../slurm-wlm/files/patch-src_scrun_scrun.c (gone) |  24 --
 .../slurm-wlm/files/patch-src_scrun_srun.c (gone)  |  12 -
 .../files/patch-src_slurmd_slurmd_slurmd.c (gone)  |  50 ----
 .../files/patch-src_slurmd_slurmd_slurmd.h (gone)  |  10 -
 .../files/patch-src_slurmd_slurmstepd_req.c (gone) |  15 --
 sysutils/slurm-wlm/files/pkg-message.in (new)      |  31 +++
 sysutils/slurm-wlm/pkg-plist                       |  85 ++++---
 30 files changed, 142 insertions(+), 1416 deletions(-)
Comment 13 Vladimir Druzenko freebsd_committer freebsd_triage 2025-11-22 18:57:52 UTC
Thanks.