Fix-test-21.41.patch

@@ -0,0 +1,65 @@
+From: Egbert Eich <eich@suse.com>
+Date: Wed Jun 22 14:39:10 2022 +0200
+Subject: Fix test 21.41
+Patch-mainline: Not yet
+Git-repo: https://github.com/SchedMD/slurm
+Git-commit: 21619ffa15d1d656ee11a477ebb8215a06387fdd
+References: 
+
+Since expect is not line oriented, the output is not matched line by line.
+Thus the order in which results are returned by sacctmgr actually matters:
+If the first test case matches what is returned first, this part will be
+consumed. If the 2nd test case will then match what is left over, the
+test will actually succeed.
+If this is not the case, ie if the first test matches a part that is
+actually sent later, the earlier parts will actually be forgotten and
+won't match at all.
+To make the test resilient to different order of results, the test has
+been rewritten to only contain a single match line.
+
+Signed-off-by: Egbert Eich <eich@suse.com>
+Signed-off-by: Egbert Eich <eich@suse.de>
+---
+ testsuite/expect/test21.41 | 30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+diff --git a/testsuite/expect/test21.41 b/testsuite/expect/test21.41
+index c0961522db..1fd921a48f 100755
+--- a/testsuite/expect/test21.41
++++ b/testsuite/expect/test21.41
+@@ -372,21 +372,21 @@ expect {
+ 	-re "There was a problem" {
+ 		fail "There was a problem with the sacctmgr command"
+ 	}
+-	-re "$user1.$wckey1.($number)." {
+-		set user1wckey1 $expect_out(1,string)
+-		exp_continue
+-	}
+-	-re "$user2.$wckey1.($number)." {
+-		set user2wckey1 $expect_out(1,string)
+-		exp_continue
+-	}
+-	-re "$user1.$wckey2.($number)." {
+-		set user1wckey2 $expect_out(1,string)
+-		exp_continue
+-	}
+-	-re "$user2.$wckey2.($number)." {
+-		set user2wckey2 $expect_out(1,string)
+-		exp_continue
++	-re "($user1|$user2).($wckey1|$wckey2).($number)." {
++	    if { $expect_out(1,string) eq $user1 } {
++		if { $expect_out(2,string) eq $wckey1 } {
++		    set user1wckey1 $expect_out(3,string)
++		} elseif { $expect_out(2,string) eq $wckey2 } {
++		    set	user1wckey2 $expect_out(3,string)
++		}
++	    } elseif { $expect_out(1,string) eq $user2 } {
++		if { $expect_out(2,string) eq $wckey1 } {
++		    set user2wckey1 $expect_out(3,string)
++		} elseif { $expect_out(2,string) eq $wckey2 } {
++		    set user2wckey2 $expect_out(3,string)
++		}
++	    }
++	    exp_continue
+ 	}
+ 	timeout {
+ 		fail "sacctmgr wckeys not responding"

slurm-23.11.5.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a8f4b1b46d3a8ec9a95066b04635c97f9095877f6189a8ff7388e5e74daeef3
+size 7365175

slurm-24.11.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39ebeeeeb5d874e090b7f2629bd319bfe7c41510931ff2244f85e961bdc69056
-size 7254375

slurm.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package slurm
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,10 +17,10 @@
 
 
 # Check file META in sources: update so_version to (API_CURRENT - API_AGE)
-%define so_version 42
+%define so_version 40
 # Make sure to update `upgrades` as well!
-%define ver 24.11.0
+%define ver 23.11.5
-%define _ver _24_11
+%define _ver _23_11
 %define dl_ver %{ver}
 # so-version is 0 and seems to be stable
 %define pmi_so 0
@@ -59,12 +59,6 @@ ExclusiveArch:  do_not_build
 %if 0%{?sle_version} == 150500 || 0%{?sle_version} == 150600
 %define base_ver 2302
 %endif
-%if 0%{?sle_version} == 150500 || 0%{?sle_version} == 150600
-%define base_ver 2302
-%endif
-%if 0%{?sle_version} == 150700
-%define base_ver 2411
-%endif
 
 %define ver_m %{lua:x=string.gsub(rpm.expand("%ver"),"%.[^%.]*$","");print(x)}
 # Keep format_spec_file from botching the define below:
@@ -176,6 +170,8 @@ Source20:       test_setup.tar.gz
 Source21:       README_Testsuite.md
 Patch0:         Remove-rpath-from-build.patch
 Patch2:         pam_slurm-Initialize-arrays-and-pass-sizes.patch
+Patch10:        Fix-test-21.41.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
 
 %{upgrade_dep %pname}
@@ -410,6 +406,19 @@ Requires:       %{name}-config = %{version}
 %description plugins
 This package contains the SLURM plugins (loadable shared objects)
 
+%package plugin-ext-sensors-rrd
+Summary:        SLURM ext_sensors/rrd Plugin (loadable shared objects)
+Group:          Productivity/Clustering/Computing
+Requires:       %{name}-plugins = %{version}
+%{upgrade_dep %{pname}-plugin-ext-sensors-rrd}
+# file was moved from slurm-plugins to here
+Conflicts:      %{pname}-plugins < %{version}
+
+%description plugin-ext-sensors-rrd
+This package contains the ext_sensors/rrd plugin used to read data
+using RRD, a tool that creates and manages a linear database for
+sampling and logging data.
+
 %package torque
 Summary:        Wrappers for transitition from Torque/PBS to SLURM
 Group:          Productivity/Clustering/Computing
@@ -520,7 +529,6 @@ This package contains just the minmal code to run a compute node.
 %package config
 Summary:        Config files and directories for slurm services
 Group:          Productivity/Clustering/Computing
-%{?sysusers_requires}
 Requires:       logrotate
 BuildArch:      noarch
 %if 0%{?suse_version} <= 1140
@@ -754,20 +762,9 @@ rm -rf %{buildroot}/%{_libdir}/slurm/*.{a,la} \
        %{buildroot}/%{_libdir}/*.la \
        %{buildroot}/%_lib/security/*.la
 
-# Fix perl
+rm %{buildroot}/%{perl_archlib}/perllocal.pod \
-rm %{buildroot}%{perl_archlib}/perllocal.pod \
+   %{buildroot}/%{perl_vendorarch}/auto/Slurm/.packlist \
-   %{buildroot}%{perl_sitearch}/auto/Slurm/.packlist \
+   %{buildroot}/%{perl_vendorarch}/auto/Slurmdb/.packlist
-   %{buildroot}%{perl_sitearch}/auto/Slurmdb/.packlist
-
-# Fix shell completion bindings
-for i in `find %{buildroot}/usr/share/bash-completion/completions/ -type l`; do
-    ln -sf $(basename $(readlink -f $i)) $i;
-done
-
-mkdir -p %{buildroot}%{perl_vendorarch}
-
-mv %{buildroot}%{perl_sitearch}/* \
-   %{buildroot}%{perl_vendorarch}
 
 # Remove Cray specific binaries
 rm -f %{buildroot}/%{_sbindir}/capmc_suspend \
@@ -1089,7 +1086,7 @@ rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite \
 %{?have_netloc:%{_bindir}/netloc_to_topology}
 %{_sbindir}/sackd
 %{_sbindir}/slurmctld
-%{_datadir}/bash-completion/completions/
+%{_sbindir}/slurmsmwd
 %dir %{_libdir}/slurm/src
 %{_unitdir}/slurmctld.service
 %{_sbindir}/rcslurmctld
@@ -1167,10 +1164,9 @@ rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite \
 %files -n perl-%{name}
 %{perl_vendorarch}/Slurm.pm
 %{perl_vendorarch}/Slurm
-%{perl_vendorarch}/Slurmdb.pm
 %{perl_vendorarch}/auto/Slurm
+%{perl_vendorarch}/Slurmdb.pm
 %{perl_vendorarch}/auto/Slurmdb
-%dir %{perl_vendorarch}/auto
 %{_mandir}/man3/Slurm*.3pm.*
 
 %files slurmdbd
@@ -1193,7 +1189,6 @@ rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite \
 %dir %{_libdir}/slurm
 %{_libdir}/slurm/libslurmfull.so
 %{_libdir}/slurm/accounting_storage_slurmdbd.so
-%{_libdir}/slurm/accounting_storage_ctld_relay.so
 %{_libdir}/slurm/acct_gather_energy_pm_counters.so
 %{_libdir}/slurm/acct_gather_energy_gpu.so
 %{_libdir}/slurm/acct_gather_energy_ibmaem.so
@@ -1202,9 +1197,8 @@ rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite \
 %{_libdir}/slurm/acct_gather_filesystem_lustre.so
 %{_libdir}/slurm/burst_buffer_lua.so
 %{_libdir}/slurm/burst_buffer_datawarp.so
-%{_libdir}/slurm/data_parser_v0_0_42.so
-%{_libdir}/slurm/data_parser_v0_0_41.so
 %{_libdir}/slurm/data_parser_v0_0_40.so
+%{_libdir}/slurm/data_parser_v0_0_39.so
 %{_libdir}/slurm/cgroup_v1.so
 %if 0%{?suse_version} >= 1500
 %{_libdir}/slurm/cgroup_v2.so
@@ -1220,13 +1214,12 @@ rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite \
 %{_libdir}/slurm/gres_nic.so
 %{_libdir}/slurm/gres_shard.so
 %{_libdir}/slurm/hash_k12.so
-%{_libdir}/slurm/hash_sha3.so
-%{_libdir}/slurm/tls_none.so
 %{_libdir}/slurm/jobacct_gather_cgroup.so
 %{_libdir}/slurm/jobacct_gather_linux.so
 %{_libdir}/slurm/jobcomp_filetxt.so
 %{_libdir}/slurm/jobcomp_lua.so
 %{_libdir}/slurm/jobcomp_script.so
+%{_libdir}/slurm/job_container_cncu.so
 %{_libdir}/slurm/job_container_tmpfs.so
 %{_libdir}/slurm/job_submit_all_partitions.so
 %{_libdir}/slurm/job_submit_defaults.so
@@ -1260,7 +1253,6 @@ rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite \
 %{_libdir}/slurm/serializer_url_encoded.so
 %{_libdir}/slurm/serializer_yaml.so
 %{_libdir}/slurm/site_factor_example.so
-%{_libdir}/slurm/switch_nvidia_imex.so
 %{_libdir}/slurm/task_affinity.so
 %{_libdir}/slurm/task_cgroup.so
 %{_libdir}/slurm/topology_3d_torus.so
@@ -1279,9 +1271,9 @@ rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite \
 %{_libdir}/slurm/node_features_knl_generic.so
 %{_libdir}/slurm/acct_gather_profile_influxdb.so
 %{_libdir}/slurm/jobcomp_elasticsearch.so
-%{_libdir}/slurm/certmgr_script.so
+
-%{_libdir}/slurm/gpu_nvidia.so
+%files plugin-ext-sensors-rrd
-%{_libdir}/slurm/mcs_label.so
+%{_libdir}/slurm/ext_sensors_rrd.so
 
 %files lua
 %{_libdir}/slurm/job_submit_lua.so
@@ -1316,6 +1308,10 @@ rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite \
 %{_mandir}/man8/slurmrestd.*
 %{_libdir}/slurm/openapi_slurmctld.so
 %{_libdir}/slurm/openapi_slurmdbd.so
+%{_libdir}/slurm/openapi_dbv0_0_39.so
+%{_libdir}/slurm/openapi_v0_0_39.so
+%{_libdir}/slurm/openapi_dbv0_0_38.so
+%{_libdir}/slurm/openapi_v0_0_38.so
 %{_libdir}/slurm/rest_auth_local.so
 %endif
 
@@ -1352,10 +1348,12 @@ rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite \
 %files config-man
 %{_mandir}/man5/acct_gather.conf.*
 %{_mandir}/man5/burst_buffer.conf.*
+%{_mandir}/man5/ext_sensors.conf.*
 %{_mandir}/man5/slurm.*
 %{_mandir}/man5/cgroup.*
 %{_mandir}/man5/gres.*
 %{_mandir}/man5/helpers.*
+#%%{_mandir}/man5/nonstop.conf.5.*
 %{_mandir}/man5/oci.conf.5.gz
 %{_mandir}/man5/topology.*
 %{_mandir}/man5/knl.conf.5.*
@@ -1370,7 +1368,17 @@ rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite \
 %endif
 
 %files cray
+# do not remove cray sepcific packages from SLES update
+# Only for Cray
+%{_libdir}/slurm/core_spec_cray_aries.so
+%{_libdir}/slurm/job_submit_cray_aries.so
+%{_libdir}/slurm/select_cray_aries.so
+%{_libdir}/slurm/switch_cray_aries.so
+%{_libdir}/slurm/task_cray_aries.so
+%{_libdir}/slurm/proctrack_cray_aries.so
 %{_libdir}/slurm/mpi_cray_shasta.so
+%{_libdir}/slurm/node_features_knl_cray.so
+%{_libdir}/slurm/power_cray_aries.so
 
 %if 0%{?slurm_testsuite}
 %files testsuite

upgrades

@@ -1,5 +1,3 @@
-24.05.4
-24.05.3
 23.11.1
 23.02.7
 23.02.6