Merge branch 'openhpc:3.x' into confluent_slurm

.cirrus.yml

@@ -4,6 +4,7 @@ env:
     components/compiler-families/intel-compilers-devel/SPECS/intel-compilers-devel.spec
     components/mpi-families/impi-devel/SPECS/intel-mpi.spec
     components/parallel-libs/trilinos/SPECS/trilinos.spec
+    components/perf-tools/geopm/SPECS/geopm.spec
 
 task:
   name: RHEL/Rocky on aarch64
@@ -23,7 +24,7 @@ task:
   test_script: |
     export SKIP_CI_SPECS="${SKIP_CI_SPECS}${JOB_SKIP_CI_SPECS}"
     chown ohpc -R tests
-    tests/ci/setup_slurm_and_run_tests.sh ohpc gnu13 $(tests/ci/cirrus_get_changed_files.sh)
+    tests/ci/setup_slurm_and_run_tests.sh ohpc gnu14 $(tests/ci/cirrus_get_changed_files.sh)
 
 openeuler_task:
   name: openEuler on aarch64
@@ -45,4 +46,4 @@ openeuler_task:
   test_script: |
     export SKIP_CI_SPECS="${SKIP_CI_SPECS}${JOB_SKIP_CI_SPECS}"
     chown ohpc -R tests
-    tests/ci/setup_slurm_and_run_tests.sh ohpc gnu13 $(tests/ci/cirrus_get_changed_files.sh)
+    tests/ci/setup_slurm_and_run_tests.sh ohpc gnu14 $(tests/ci/cirrus_get_changed_files.sh)

.github/workflows/validate.yml

@@ -65,7 +65,7 @@ jobs:
   build_on_rhel:
     strategy:
       matrix:
-        compiler: [gnu13, intel]
+        compiler: [gnu14, intel]
     runs-on: ubuntu-latest
     name: Build on RHEL (${{ matrix.compiler}})
     container:
@@ -89,6 +89,9 @@ jobs:
       run: |
         if [ "${{ matrix.compiler }}" == "intel" ]; then
           export SKIP_CI_SPECS="${{ env.SKIP_CI_SPECS }} components/serial-libs/openblas/SPECS/openblas.spec"
+          export SKIP_CI_SPECS="${SKIP_CI_SPECS} components/dev-tools/scipy/SPECS/python-scipy.spec"
+          export SKIP_CI_SPECS="${SKIP_CI_SPECS} components/serial-libs/R/SPECS/R.spec"
+          export SKIP_CI_SPECS="${SKIP_CI_SPECS} components/parallel-libs/opencoarrays/SPECS/opencoarrays.spec"
         fi
         . /etc/profile.d/lmod.sh
         tests/ci/run_build.py ohpc ${{ steps.files.outputs.added_modified }} --compiler-family ${{ matrix.compiler }}
@@ -105,7 +108,7 @@ jobs:
   test_on_rhel:
     strategy:
       matrix:
-        compiler: [gnu13, intel]
+        compiler: [gnu14, intel]
     runs-on: ubuntu-latest
     name: Test on RHEL
     env:
@@ -139,6 +142,10 @@ jobs:
         export SKIP_CI_SPECS="${{ env.SKIP_CI_SPECS }}${{ env.JOB_SKIP_CI_SPECS }}"
         if [ "${{ matrix.compiler }}" == "intel" ]; then
           export SKIP_CI_SPECS="${SKIP_CI_SPECS} components/serial-libs/openblas/SPECS/openblas.spec"
+          export SKIP_CI_SPECS="${SKIP_CI_SPECS} components/dev-tools/scipy/SPECS/python-scipy.spec"
+          export SKIP_CI_SPECS="${SKIP_CI_SPECS} components/serial-libs/R/SPECS/R.spec"
+          export SKIP_CI_SPECS="${SKIP_CI_SPECS} components/perf-tools/tau/SPECS/tau.spec"
+          export SKIP_CI_SPECS="${SKIP_CI_SPECS} components/parallel-libs/opencoarrays/SPECS/opencoarrays.spec"
         fi
         . /etc/profile.d/lmod.sh
         chown ohpc -R tests
@@ -185,7 +192,7 @@ jobs:
   test_on_openEuler:
     strategy:
       matrix:
-        compiler: [gnu13]
+        compiler: [gnu14]
     env:
       JOB_SKIP_CI_SPECS: |
         components/runtimes/charliecloud/SPECS/charliecloud.spec
@@ -246,7 +253,7 @@ jobs:
   test_on_leap:
     strategy:
       matrix:
-        compiler: [gnu13]
+        compiler: [gnu14]
     env:
       JOB_SKIP_CI_SPECS: |
         components/runtimes/charliecloud/SPECS/charliecloud.spec

components/OHPC_macros

@@ -29,7 +29,7 @@
 %global debug_package   %{nil}
 
 %if 0%{?rhel} >= 9 || 0%{?openEuler}
-%{!?dist: %global dist 300.ohpc}
+%{!?dist: %global dist 320.ohpc}
 %else
 %{!?dist: %global dist 27.ohpc}
 %endif
@@ -79,13 +79,18 @@ BuildRequires: ohpc-buildroot
 # these choices can be overridden by specifing the compiler_family/mpi_family
 # variables via rpmbuild or other mechanisms.
 
-%{!?compiler_family: %global compiler_family gnu13}
+%{!?compiler_family: %global compiler_family gnu14}
 %{!?mpi_family: %global mpi_family openmpi5}
 %{!?python_family: %global python_family python3}
 
 # Compiler dependencies
 %if 0%{?ohpc_compiler_dependent} == 1
 
+%if "%{compiler_family}" == "gnu14"
+BuildRequires: gnu14-compilers%{PROJ_DELIM} >= 14.1.0
+Requires:      gnu14-compilers%{PROJ_DELIM} >= 14.1.0
+%global gnu_family gnu14
+%endif
 %if "%{compiler_family}" == "gnu13"
 BuildRequires: gnu13-compilers%{PROJ_DELIM} >= 13.1.0
 Requires:      gnu13-compilers%{PROJ_DELIM} >= 13.1.0

components/OHPC_setup_compiler

@@ -48,6 +48,13 @@ elif [ "${OHPC_COMPILER_FAMILY}" = "gnu13" ]; then
 	export F77=gfortran
 	module purge
 	module load gnu13
+elif [ "${OHPC_COMPILER_FAMILY}" = "gnu14" ]; then
+	export CC=gcc
+	export CXX=g++
+	export FC=gfortran
+	export F77=gfortran
+	module purge
+	module load gnu14
 elif [ "${OHPC_COMPILER_FAMILY}" = "gnu9" ]; then
 	export CC=gcc
 	export CXX=g++

components/admin/conman/SPECS/conman.spec

@@ -81,7 +81,6 @@ SERVER logdir="/var/log/conman"
 SERVER logfile="/var/log/conman.log"
 SERVER loopback=ON
 SERVER pidfile="/var/run/conman.pid"
-SERVER resetcmd="powerman -0 %N; sleep 3; powerman -1 %N"
 SERVER tcpwrappers=ON
 SERVER timestamp=1h
 GLOBAL seropts="115200,8n1"

components/admin/docs/SOURCES/get_source.sh

@@ -1,33 +1,34 @@
 #!/usr/bin/env bash
 
-set -x
+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
-DOCS_OHPC_FOLDER=docs-ohpc
+DOCS_OHPC_FOLDER="docs-ohpc"
 
 cleanup() {
-    rm -rf ${DOCS_OHPC_FOLDER}
-    find ${OHPC_ROOT_FOLDER}/docs/recipes/install/ -name "vc.tex" -delete
+    rm -rf "${DOCS_OHPC_FOLDER}"
+    find "${OHPC_ROOT_FOLDER}/docs/recipes/install/" -name "vc.tex" -delete
 }
 trap cleanup EXIT
 
 # 1. Prepare
 cleanup
-mkdir -p ${DOCS_OHPC_FOLDER}
+mkdir -p "${DOCS_OHPC_FOLDER}"
 
 # 2. Copy the Git metadata
-cp -r ${OHPC_ROOT_FOLDER}/.git ${DOCS_OHPC_FOLDER}
+cp -r "${OHPC_ROOT_FOLDER}/.git" "${DOCS_OHPC_FOLDER}"
 
 # 3. Copy the local docs/
-cp -r ${OHPC_ROOT_FOLDER}/docs ${DOCS_OHPC_FOLDER}
+cp -r "${OHPC_ROOT_FOLDER}/docs" "${DOCS_OHPC_FOLDER}"
 
 # 4. Add dummy vc.tex to the docs
-for makefile in `find ${DOCS_OHPC_FOLDER}/docs/recipes/install/ -name "Makefile"`; do
-    folder=$(dirname ${makefile})
-    cat <<'EOF' > ${folder}/vc.tex
+find "${DOCS_OHPC_FOLDER}"/docs/recipes/install/ -name "Makefile" -print0 | while IFS= read -r -d '' makefile
+do
+    folder=$(dirname "${makefile}")
+    cat <<'EOF' > "${folder}"/vc.tex
 %%% Define Git specific macros.
 \gdef\GITHash{5ffbf3e2ed0ed558c1ae5672f7e5023298b7c2a9}%
 \gdef\GITAbrHash{5ffbf3e}%
@@ -55,4 +56,4 @@ EOF
 done
 
 # 5. Create docs-ohpc.tar
-tar cf ../SOURCES/docs-ohpc.tar ${DOCS_OHPC_FOLDER}
+tar cf ../SOURCES/docs-ohpc.tar "${DOCS_OHPC_FOLDER}"

components/admin/docs/SPECS/docs.spec

@@ -11,7 +11,7 @@
 %include %{_sourcedir}/OHPC_macros
 
 Name:           docs%{PROJ_DELIM}
-Version:        3.1.0
+Version:        3.2.0
 Release:        1
 Summary:        OpenHPC documentation
 License:        BSD-3-Clause

components/admin/genders/SPECS/genders.spec

@@ -12,11 +12,11 @@
 %define pname genders
 
 Name:    %{pname}%{PROJ_DELIM}
-Version: 1.27
+Version: 1.29
 Release: 1%{?dist}
 Summary: Static cluster configuration database
 License: GPL
-Source0:  https://github.com/chaos/genders/archive/genders-1-27-3.tar.gz
+Source0:  https://github.com/chaos/genders/archive/genders-1-29-1.tar.gz
 Group:   %{PROJ_NAME}/admin
 URL:     https://github.com/chaos/genders
 
@@ -61,7 +61,7 @@ genders API that is compatible with earlier releases of genders
 %{!?_with_perl_site_arch: %{!?_with_perl_vendor_arch: %global _with_perl_vendor_arch --with-perl-vendor-arch}}
 
 %prep
-%setup  -q -n %{pname}-%{pname}-1-27-3
+%setup  -q -n %{pname}-%{pname}-1-29-1
 
 %build
 

components/admin/hpc-workspace/SPECS/hpcworkspace.spec

@@ -13,7 +13,7 @@
 %define pname hpc-workspace
 
 Name:    %{pname}%{PROJ_DELIM}
-Version: 1.4.0
+Version: 1.5.0
 Release: 1%{?dist}
 Summary: Temporary workspace management
 License: GPL

components/admin/meta-packages/SPECS/meta-packages.spec

@@ -17,7 +17,7 @@
 
 Summary: Meta-packages to ease installation
 Name:    meta-packages
-Version: 3.0
+Version: 3.2
 Release: 1
 License: Apache-2.0
 Group:   %{PROJ_NAME}/meta-package

components/admin/ohpc-filesystem/SPECS/ohpc-filesystem.spec

@@ -9,7 +9,7 @@
 #----------------------------------------------------------------------------eh-
 
 %if 0%{?rhel} >= 9 || 0%{?openEuler} || 0%{?sle_version} >= 150400
-%define version 3.1
+%define version 3.2
 %else
 %define version 2.7
 %endif