From 800d95ce032c47707567be137cd7bea655e3f77a Mon Sep 17 00:00:00 2001
From: Damian Alvarez <swmanage@jrlogin12.jureca>
Date: Thu, 10 Jun 2021 21:03:19 +0200
Subject: [PATCH] To don't have None references or empty lists
---
.gitlab-ci.yml | 2 ++
Custom_Hooks/eb_hooks.py | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de49aa56b..8998158c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,8 @@ check_style:
- export EASYBUILD_INCLUDE_TOOLCHAINS="$CI_PROJECT_DIR/Custom_Toolchains/*.py,$CI_PROJECT_DIR/Custom_Toolchains/fft/*.py,$CI_PROJECT_DIR/Custom_Toolchains/compiler/*.py,$CI_PROJECT_DIR/Custom_Toolchains/linalg/*.py"
- export EASYBUILD_ROBOT="$CI_PROJECT_DIR/Golden_Repo"
- export EASYBUILD_HOOKS="$CI_PROJECT_DIR/Custom_Hooks/eb_hooks.py"
+ # Let's make this a system where all the packages can be installed, so all of them can be checked without aborting
+ - export LMOD_SYSTEM_NAME="juwels"
- OVERLAYS=$(ls Overlays)
- for i in $OVERLAYS; do
- export EASYBUILD_ROBOT="$EASYBUILD_ROBOT:$CI_PROJECT_DIR/Overlays/$i"
diff --git a/Custom_Hooks/eb_hooks.py b/Custom_Hooks/eb_hooks.py
index a8ee9578b..f1efa947c 100644
--- a/Custom_Hooks/eb_hooks.py
+++ b/Custom_Hooks/eb_hooks.py
@@ -44,11 +44,11 @@ SUPPORTED_TOOLCHAIN_FAMILIES = (
)
VETOED_INSTALLATIONS = {
'juwelsbooster': ['impi'],
- 'juwels': [],
- 'jurecadc': [],
+ 'juwels': [''],
+ 'jurecadc': [''],
'jurecabooster': ['OpenMPI', 'CUDA', 'nvidia-driver', 'UCX', 'NVHPC'],
'jusuf': ['impi'],
- 'hdfml': [],
+ 'hdfml': [''],
}
# Also maintain a list of CUDA enabled compilers
--
GitLab