lmod: update to 8.7.53

Add a simple test for lmod component: just load /etc/profile.d/lmod.sh to verify that it does not have syntax errors Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
openhpc · Oct 18, 2024 · 8aec291 · 8aec291
1 parent c178efc
commit 8aec291
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 2 deletions.
diff --git a/components/admin/lmod/SPECS/lmod.spec b/components/admin/lmod/SPECS/lmod.spec
@@ -16,7 +16,7 @@
 
 Summary:   Lua based Modules (lmod)
 Name:      %{pname}%{PROJ_DELIM}
-Version:   8.7.37
+Version:   8.7.53
 Release:   %{?dist}.1
 License:   MIT
 Group:     %{PROJ_NAME}/admin

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -41,6 +41,11 @@ if SPACK_ENABLED
 endif
 
 
+if LMOD_ENABLED
+   SUBDIRS += admin/lmod
+endif
+
+
 else # non root tests
 
 if CHARLIECLOUD_ENABLED

diff --git a/tests/admin/Makefile.am b/tests/admin/Makefile.am
@@ -13,4 +13,4 @@ endif
 
 if SLURM_ENABLED
 TESTS  += slurm-plugins
-endif
+endif
diff --git a/tests/admin/lmod/Makefile.am b/tests/admin/lmod/Makefile.am
@@ -0,0 +1,3 @@
+TESTS_ENVIRONMENT = BATS_NO_SUMMARY=1
+
+TESTS  = lmod
diff --git a/tests/admin/lmod/common b/tests/admin/lmod/common
@@ -0,0 +1 @@
+../../common
diff --git a/tests/admin/lmod/lmod b/tests/admin/lmod/lmod
@@ -0,0 +1,21 @@
+#!/usr/bin/env -S bats --report-formatter junit --formatter tap
+# -*-sh-*-
+
+load ./common/test_helper_functions || exit 1
+source ./common/functions || exit 1
+
+if [ -s ./common/TEST_ENV ];then
+    source ./common/TEST_ENV
+fi
+
+setup() {
+    if [ -z "$MODULEPATH" ];then
+        . /etc/profile.d/lmod.sh || exit 1
+    fi
+    module purge        || exit 1
+}
+
+
+@test "[lmod] test that the setup function passed" {
+    assert_success
+}
diff --git a/tests/ci/spec_to_test_mapping.py b/tests/ci/spec_to_test_mapping.py
@@ -259,6 +259,11 @@
         '',
         '',
     ],
+    'components/admin/lmod/SPECS/lmod.spec': [
+        '',
+        'lmod',
+        ''
+    ],
 }
 
 # Check which base OS we are using

diff --git a/tests/configure.ac b/tests/configure.ac
@@ -129,6 +129,14 @@ AC_ARG_ENABLE([spack],
 	 [],[enable_spack=yes])
 AM_CONDITIONAL(SPACK_ENABLED,test "x$enable_spack" = "xyes" ) 
 
+#------------------------------------------------------------------------------------------
+# lmod
+AC_ARG_ENABLE([lmod],
+	 [AS_HELP_STRING([--enable-lod],[Enable lmod tests (default=yes, root only)])],
+	 [],[enable_lmod=yes])
+AM_CONDITIONAL(LMOD_ENABLED,test "x$enable_lmod" = "xyes" ) 
+
+
 #-----------------
 # User level tests
 #-----------------
@@ -520,6 +528,7 @@ AC_OUTPUT( Makefile
        fs/beegfs/Makefile
        fs/lustre/Makefile
        dev-tools/easybuild/Makefile
+       admin/lmod/Makefile
        admin/spack/Makefile
        dev-tools/mpi4py/Makefile
        dev-tools/mpi4py/tests/Makefile
@@ -606,6 +615,11 @@ if test "x$ROOT_ENABLED" = "x1" ; then
        echo '    'Spack..................... : disabled
     fi
 
+    if test "x$enable_lmod" = "xyes"; then
+       echo '    'Lmod...................... : enabled
+    else
+       echo '    'Lmod...................... : disabled
+    fi
 
 else