Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

admin/meta-packages: use singularity-ce on rhel clones #1645

Merged
merged 1 commit into from
Jan 11, 2023
Merged

admin/meta-packages: use singularity-ce on rhel clones #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion components/admin/meta-packages/SPECS/meta-packages.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,14 @@ Requires: libicu
Requires: libunwind
Requires: numactl
Requires: python3
Requires: singularity
%if 0%{?rhel}
Requires: cairo-devel
Requires: libpciaccess
Requires: libseccomp
Requires: librdmacm
Requires: NetworkManager
Requires: perl-interpreter
Recommends: (singularity-ce or singularity or apptainer)
%ifarch x86_64
Requires: libpsm2
%endif
Expand All @@ -104,6 +104,7 @@ Requires: libpciaccess0
Requires: libatomic1
Requires: librdmacm1
Requires: libicu-suse65_1
Requires: singularity
%ifarch x86_64
Requires: libpsm2-2
%endif
Expand Down Expand Up @@ -354,7 +355,12 @@ Collection of python3 related library builds for use with GNU compiler toolchain
%package -n %{PROJ_NAME}-%{compiler_family}-runtimes
Summary: OpenHPC runtimes for GNU
Requires: charliecloud%{PROJ_DELIM}
%if 0%{?suse_version}
Requires: singularity
%endif
%if 0%{?rhel}
Recommends: (singularity-ce or singularity or apptainer)
%endif
%description -n %{PROJ_NAME}-%{compiler_family}-runtimes
Collection of runtimes for use with GNU compiler toolchain

Expand Down
2 changes: 1 addition & 1 deletion tests/ci/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lint: codespell-lint flake8-lint whitespace-lint
lint: codespell-lint flake8-lint whitespace-lint shellcheck-lint

codespell-lint:
@echo "Running 'codespell' on all spec files"
Expand Down
5 changes: 4 additions & 1 deletion tests/ci/setup_slurm_and_run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,17 @@ dnf -y install \
make \
which \
sudo \
prun-ohpc \
openmpi4-gnu12-ohpc \
mpich-gnu12-ohpc \
slurm-slurmd-ohpc \
slurm-slurmctld-ohpc \
slurm-example-configs-ohpc \
slurm-ohpc

# Install rebuilt packages (if any)
# shellcheck disable=SC2046 # (we want the words to be split)
dnf -y install prun-ohpc gnu12-compilers-ohpc openmpi4-gnu12-ohpc mpich-gnu12-ohpc $(find /home/"${USER}"/rpmbuild/RPMS/ -name "*rpm") || true
dnf -y install $(find /home/"${USER}"/rpmbuild/RPMS/ -name "*rpm") || true

# Setup slurm
echo "127.0.0.1 node0 node1" >> /etc/hosts
Expand Down