pool/slurm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1005746 from home:eeich:branches:network:cluster

Browse Source 
- Do not deduplicate files of testsuite Slurm configuration.
  This directory is supposed to be mounted over /etc/slurm
  therefore it must not contain softlinks to the files in
  this directory.
- Improve .a and .o file collection for test suite: find these
  files even if there are multiple ones in a single line.

OBS-URL: https://build.opensuse.org/request/show/1005746
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=218
This commit is contained in:
Egbert Eich 2022-09-26 15:01:51 +00:00 committed by Git OBS Bridge
parent 3f68233e21
commit 09aecc2015
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slurm.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat Sep 24 07:34:31 UTC 2022 - Egbert Eich <eich@suse.com>
- Do not deduplicate files of testsuite Slurm configuration.
This directory is supposed to be mounted over /etc/slurm
therefore it must not contain softlinks to the files in
this directory.
- Improve .a and .o file collection for test suite: find these
files even if there are multiple ones in a single line.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 21:12:19 UTC 2022 - Egbert Eich <eich@suse.com> Tue Sep 20 21:12:19 UTC 2022 - Egbert Eich <eich@suse.com>

8
slurm.spec
View File

@ -152,7 +152,7 @@ Source1: slurm-rpmlintrc
Source10: https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slurm/slurmd.xml Source10: https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slurm/slurmd.xml
Source11: https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slurm/slurmctld.xml Source11: https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slurm/slurmctld.xml
Source12: https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slurm/slurmdbd.xml Source12: https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slurm/slurmdbd.xml
# create: tar --owner=nobody --group=nogroup -cvzf test_setup.tar.gz test_setup # create: tar --owner=nobody --group=nogroup --exclude=*~ -cvzf test_setup.tar.gz test_setup
Source20: test_setup.tar.gz Source20: test_setup.tar.gz
Source21: README_Testsuite.md Source21: README_Testsuite.md
Patch0: Remove-rpath-from-build.patch Patch0: Remove-rpath-from-build.patch
@ -851,7 +851,7 @@ while true; do
filelist="$(for i in $filelist $tlist; do echo $i; done | sort | uniq)" filelist="$(for i in $filelist $tlist; do echo $i; done | sort | uniq)"
[ "$filelist" = "$oldfilelist" ] && break [ "$filelist" = "$oldfilelist" ] && break
done done
filelist+=" $(grep -r "build_dir.*\.[oa]" | sed -e 's@.*[^ ]*{build_dir}/\([^\]*\.o\).*@\1@' | sort | uniq)" filelist+=" $(grep -Ehor '\{*build_dir\}*[^ ]*\.[oa]' | sed -e "s@{*build_dir}*/@@" | sort | uniq)"
cd - cd -
newlist="" newlist=""
for i in $filelist; do for i in $filelist; do
@ -920,11 +920,13 @@ mkdir -p %{buildroot}/root
mv test_setup/setup-testsuite.sh %{buildroot}/root mv test_setup/setup-testsuite.sh %{buildroot}/root
mkdir -p %{buildroot}/srv/slurm-testsuite/config/plugstack.conf.d mkdir -p %{buildroot}/srv/slurm-testsuite/config/plugstack.conf.d
mv test_setup/* %{buildroot}/srv/slurm-testsuite/config
cp %{S:21} . cp %{S:21} .
%endif %endif
%fdupes -s %{buildroot} %fdupes -s %{buildroot}
# For testsuite - do after fdupes!
[ -d test_setup -a -d %{buildroot}/srv/slurm-testsuite/config ] && \
mv test_setup/* %{buildroot}/srv/slurm-testsuite/config
# Temporary - remove when build is fixed upstream. # Temporary - remove when build is fixed upstream.
%if !0%{?build_slurmrestd} %if !0%{?build_slurmrestd}