diff --git a/Fix-test-1.99.patch b/Fix-test-1.99.patch deleted file mode 100644 index 4e0c683..0000000 --- a/Fix-test-1.99.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Egbert Eich -Date: Thu Feb 23 08:08:57 2023 +0100 -Subject: Fix test1.99 -Patch-mainline: Not yet -Git-commit: 5f3acbf12e58cb8ea8d585ea1040c641e3f00a2e -References: - -Signed-off-by: Egbert Eich -Signed-off-by: Egbert Eich ---- - testsuite/expect/test1.99 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/testsuite/expect/test1.99 b/testsuite/expect/test1.99 -index 157a512..f66176d 100755 ---- a/testsuite/expect/test1.99 -+++ b/testsuite/expect/test1.99 -@@ -122,7 +122,7 @@ log_info "---Checking that srun uses correct ports---" - - make_bash_script $file_in " - $srun $bin_bash -c \" --task_id=\\\$($scontrol show step \$SLURM_JOBID\.\$SLURM_STEPID | $bin_grep SrunHost | $bin_awk -F: '{print \\\$3}') -+task_id=\\\$($scontrol show step \\\$SLURM_JOBID\.\\\$SLURM_STEPID | $bin_grep SrunHost | $bin_awk -F: '{print \\\$3}') - lsof -P -p \\\$task_id 2>/dev/null | $bin_grep LISTEN | $bin_awk '{print \\\$9}' | $bin_awk -F: '{print \\\$2}' - \"" - diff --git a/slurm-23-02-0-0rc1.tar.gz b/slurm-23-02-0-0rc1.tar.gz deleted file mode 100644 index f0b3147..0000000 --- a/slurm-23-02-0-0rc1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0148044bbf1411ea4532ef0bf8d77dbac8d8712bb3a5e514725e6888efe0d58 -size 9878894 diff --git a/slurm-23.02.0.tar.bz2 b/slurm-23.02.0.tar.bz2 new file mode 100644 index 0000000..8c2a110 --- /dev/null +++ b/slurm-23.02.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21b902d24871a57f9074c58be194678b4410e9fccda3553305a008aa2954cea0 +size 7258420 diff --git a/slurm.changes b/slurm.changes index 0f1ecac..813acdd 100644 --- a/slurm.changes +++ b/slurm.changes @@ -87,6 +87,8 @@ Mon Feb 20 20:45:59 UTC 2023 - Egbert Eich by ':'. + New command scrun has been added. scrun acts as an Open Container Initiative (OCI) runtime proxy to run containers seamlessly via Slurm. + + Fixed GpuFreqDef option. When set in slurm.conf, it will be used if + --gpu-freq was not explicitly set by the job step. * Configuration Changes + job_container.conf - Added "Dirs" option to list desired private mount points. @@ -140,6 +142,11 @@ Mon Feb 20 20:45:59 UTC 2023 - Egbert Eich ReconfigFlags=KeepPowerSaveSettings. + slurmdbd.conf - Add new AllResourcesAbsolute to force all new resources to be created with the Absolute flag. + + topology/tree - Add new TopologyParam=SwitchAsNodeRank option to reorder + nodes based on switch layout. This can be useful if the naming convention + for the nodes does not natually map to the network topology. + + Removed the default setting for GpuFreqDef. If unset, no attempt to change + the GPU frequency will be made if --gpu-freq is not set for the step. * Command Changes + sacctmgr - no longer force updates to the AdminComment, Comment, or SystemComment to lower-case. diff --git a/slurm.spec b/slurm.spec index 12e1a99..2af566b 100644 --- a/slurm.spec +++ b/slurm.spec @@ -20,9 +20,9 @@ %define so_version 39 %define ver 23.02.0 %define _ver _23_02 -%define rc_v 0rc1 -#%%define dl_ver %{ver} -%define dl_ver 23-02-0%{?rc_v:-%rc_v} +#%%define rc_v 0rc1 +%define dl_ver %{ver} +#%%define dl_ver 23-02-0%{?rc_v:-%rc_v} # so-version is 0 and seems to be stable %define pmi_so 0 %define nss_so 2 @@ -152,8 +152,8 @@ Summary: Simple Linux Utility for Resource Management License: SUSE-GPL-2.0-with-openssl-exception Group: Productivity/Clustering/Computing URL: https://www.schedmd.com -#Source: https://download.schedmd.com/slurm/%{pname}-%{dl_ver}.tar.bz2 -Source: https://github.com/SchedMD/slurm/archive/refs/tags/%{pname}-%{dl_ver}.tar.gz +Source: https://download.schedmd.com/slurm/%{pname}-%{dl_ver}.tar.bz2 +#Source: https://github.com/SchedMD/slurm/archive/refs/tags/%{pname}-%{dl_ver}.tar.gz Source1: slurm-rpmlintrc Source10: https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slurm/slurmd.xml Source11: https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slurm/slurmctld.xml @@ -169,7 +169,6 @@ Patch12: Fix-test-32.8.patch Patch13: Fix-test-3.13.patch Patch14: Keep-logs-of-skipped-test-when-running-test-cases-sequentially.patch Patch15: Fix-test7.2-to-find-libpmix-under-lib64-as-well.patch -Patch16: Fix-test-1.99.patch %{?upgrade:Provides: %{pname} = %{version}} %{?upgrade:Conflicts: %{pname}} @@ -644,7 +643,7 @@ configuration. This test package is meant for internal purposes. Do not run test suite and file bug reports for each failed test! %prep -%setup -q -n %{pname}-%{pname}-%{dl_ver} +%setup -q -n %{pname}-%{dl_ver} %patch0 -p1 %patch2 -p1 %patch10 -p1 @@ -653,7 +652,6 @@ Do not run test suite and file bug reports for each failed test! %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 %if 0%{?python_ver} < 3 # Workaround for wrongly flagged python3 to keep SLE-11-SP4 building @@ -1448,9 +1446,9 @@ rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite \ %{?comp_at} %{_sbindir}/slurmd %{_sbindir}/slurmstepd -%{_sbindir}/scrun # bsc#1153095 %{_bindir}/srun +%{_bindir}/scrun %{_mandir}/man1/srun.1* %{_mandir}/man1/scrun.1* %{_mandir}/man8/slurmd.* @@ -1526,7 +1524,7 @@ rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite \ %dir %attr(-, %slurm_u, %slurm_u) /srv/slurm-testsuite %attr(-, root, root) %{_datadir}/%{name} %if 0%{?sle_version} == 120200 || 0%{?suse_version} >= 1550 -%dir %{_pam_secconfdir}/limits.d +%dir %attr(-, root, root) %{_pam_secconfdir}/limits.d %endif %doc testsuite/expect/README %doc %{basename: %{S:21}}