Update EasyBuild to version 5.3.0 and enhance test dependencies

.github/workflows/validate.yml

@@ -111,6 +111,7 @@ jobs:
     - name: Validate Build
       run: |
         . /etc/profile.d/lmod.sh
+        zypper --no-gpg-checks refresh
         tests/ci/run_build.py ohpc ${{ steps.files.outputs.added_modified }}
         touch /tmp/empty
     - uses: actions/upload-artifact@v7
@@ -153,6 +154,7 @@ jobs:
         sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 || true
     - name: Run CI Tests
       run: |
+        zypper --no-gpg-checks refresh
         export SKIP_CI_SPECS="${{ env.SKIP_CI_SPECS }}${{ env.JOB_SKIP_CI_SPECS }}"
         . /etc/profile.d/lmod.sh
         chown ohpc -R tests

components/admin/docs/SOURCES/get_source.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+set -xe
+
+# Note: The current working directory is the component's SPEC folder
+
+# The folder that will contain the .git/ and docs/ folders
+DOCS_OHPC_FOLDER="docs-ohpc"
+# A folder that contains the full Git history of the project
+# Full history is needed for the usage of `git archive` command
+COMPLETE_OHPC_FOLDER=$(mktemp -d)
+
+cleanup() {
+    rm -rf "${DOCS_OHPC_FOLDER}" "${COMPLETE_OHPC_FOLDER}"
+}
+trap cleanup EXIT
+
+# 1. Prepare
+cleanup
+mkdir -p "${DOCS_OHPC_FOLDER}"
+
+# 2. Fetch the full Git history so that `git describe` works later
+git clone https://github.com/openhpc/ohpc "${COMPLETE_OHPC_FOLDER}"
+cp -r "${COMPLETE_OHPC_FOLDER}/.git" "${DOCS_OHPC_FOLDER}"
+
+# 3. Copy the local docs/
+cp -r ../../../../docs "${DOCS_OHPC_FOLDER}"
+
+# 4. Create docs-ohpc.tar
+tar cf ../SOURCES/docs-ohpc.tar "${DOCS_OHPC_FOLDER}"
+
+# 5. Cleanup
+cleanup

components/admin/docs/SPECS/docs.spec

@@ -11,7 +11,7 @@
 %include %{_sourcedir}/OHPC_macros
 
 Name:           docs%{PROJ_DELIM}
-Version:        2.9.0
+Version:        2.10.0
 Release:        1
 Summary:        OpenHPC documentation
 License:        BSD-3-Clause
@@ -20,6 +20,7 @@ URL:            https://github.com/openhpc/ohpc
 Source0:        docs-ohpc.tar
 
 BuildRequires:  git
+BuildRequires:  make
 BuildRequires:  texlive-latex
 BuildRequires:  texlive-caption
 BuildRequires:  texlive-colortbl

components/admin/test-suite/SOURCES/get_source.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+set -xe
+
+# Note: The current working directory is the component's SPEC folder
+OHPC_ROOT_FOLDER="../../../.."
+
+# The folder that will contain the .git/ and docs/ folders
+TESTS_OHPC_FOLDER=tests-ohpc
+
+cleanup() {
+    rm -rf "${TESTS_OHPC_FOLDER}"
+}
+trap cleanup EXIT
+
+# 1. Prepare
+cleanup
+mkdir -p "${TESTS_OHPC_FOLDER}"
+
+# 2. Copy the local docs/
+cp -r "${OHPC_ROOT_FOLDER}/tests" "${TESTS_OHPC_FOLDER}"
+
+# 3. Create tests-ohpc.tar
+tar cf ../SOURCES/tests-ohpc.tar "${TESTS_OHPC_FOLDER}"

components/dev-tools/easybuild/SPECS/easybuild.spec

@@ -17,7 +17,7 @@
 
 Summary:   Software build and installation framework
 Name:      EasyBuild%{PROJ_DELIM}
-Version:   4.9.4
+Version:   5.3.0
 Release:   %{?dist}.1
 License:   GPLv2
 Group:     %{PROJ_NAME}/dev-tools
@@ -27,10 +27,28 @@ Source0:   https://pypi.io/packages/source/e/easybuild/easybuild-%{version}.tar.
 Source1:   https://pypi.io/packages/source/e/easybuild-easyblocks/easybuild_easyblocks-%{version}.tar.gz
 Source2:   https://pypi.io/packages/source/e/easybuild-easyconfigs/easybuild_easyconfigs-%{version}.tar.gz
 Source3:   https://pypi.io/packages/source/e/easybuild-framework/easybuild_framework-%{version}.tar.gz
-BuildRequires: python3-devel python3-pip
-BuildRequires: python3-setuptools
-Requires:  python3
+%if 0%{?suse_version}
+%define python_prefix python39
+%define python_bin python3.9
+%define python_ver 3.9
+%else
+%define python_prefix python3.12
+%define python_bin python3.12
+%define python_ver 3.12
+%endif
+
+BuildRequires: %{python_prefix}-devel %{python_prefix}-pip
+BuildRequires: %{python_prefix}-setuptools
+%if !0%{?suse_version}
+BuildRequires: %{python_prefix}-wheel
+%endif
+Requires:  %{python_prefix}
 Requires:  patch
+%if 0%{?suse_version}
+Requires:  libopenssl-devel
+%else
+Requires:  openssl-devel
+%endif
 #!BuildIgnore: post-build-checks
 
 # Lmod dependency (note that lmod is pre-populated in the OpenHPC OBS build
@@ -55,7 +73,7 @@ systems in an efficient way.
 %install
 for eb in framework easyblocks easyconfigs; do
 	cd %{pname}_${eb}-%{version}
-	pip3 install --prefix=%{install_path} --root=%{buildroot} .
+	pip%{python_ver} install --prefix=%{install_path} --root=%{buildroot} .
 	cd ..
 done
 
@@ -86,9 +104,9 @@ module          use                     \$home/.local/easybuild/modules/all
 
 setenv          EBROOTEASYBUILD         %{install_path}
 setenv          EBVERSIONEASYBUILD      %{version}
-setenv          EB_PYTHON               python3
+setenv          EB_PYTHON               %{python_bin}
 
-prepend-path	PYTHONPATH	    %{install_path}/lib/python%{python3_version}/site-packages
+prepend-path	PYTHONPATH	    %{install_path}/lib/python%{python_ver}/site-packages
 
 EOF
 
@@ -104,13 +122,13 @@ EOF
 
 for file in \
 	easybuild/easyconfigs/p/PyTorch/PyTorch-check-cpp-extension.py \
-	easybuild/scripts/bootstrap_eb.py \
 	easybuild/scripts/clean_gists.py \
 	easybuild/scripts/findPythonDeps.py \
 	easybuild/scripts/fix_docs.py \
 	easybuild/scripts/mk_tmpl_easyblock_for.py \
+	lib/python%{python_ver}/site-packages/easybuild/easyblocks/p/pytorch.py \
 	easybuild/scripts/rpath_args.py; do
-	sed -e "s,^#\!/usr/bin/env python,#\!/usr/bin/env python3,g" \
+	sed -e "s,^#\!\s*/usr/bin/env python,#\!/usr/bin/env %{python_bin},g" \
 		-i %{buildroot}/%{install_path}/${file}
 done