From f49a1ce7d9ab9307f31a5d750d2761c90c6a3f8a Mon Sep 17 00:00:00 2001
From: Andreas Marek <amarek@rzg.mpg.de>
Date: Fri, 26 Jan 2018 11:34:28 +0100
Subject: [PATCH] Gitlab CI always source ci-env-vars
---
.gitlab-ci.yml | 1 +
ci_test_scripts/.ci-env-vars | 4 ++--
ci_test_scripts/generate_gitlab_ci_tests.py | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f1791c4..ec860e57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,6 +80,7 @@ before_script:
- export SKIP_STEP=0
- ./autogen.sh
- export SKIP_STEP=0
+ - source /etc/profile.d/modules.sh && . ./ci_test_scripts/.ci-env-vars
diff --git a/ci_test_scripts/.ci-env-vars b/ci_test_scripts/.ci-env-vars
index 2381e413..1320e409 100644
--- a/ci_test_scripts/.ci-env-vars
+++ b/ci_test_scripts/.ci-env-vars
@@ -51,8 +51,8 @@ export MKL_GFORTRAN_SCALAPACK_NO_MPI_OMP_BASELINE="-L$MKL_HOME/lib/intel64 -lmkl
export MKL_GFORTRAN_SCALAPACK_FCFLAGS_NO_MPI_OMP="-I$MKL_HOME/include/intel64/lp64"
export MKL_GFORTRAN_SCALAPACK_LDFLAGS_NO_MPI_OMP="$MKL_GFORTRAN_SCALAPACK_NO_MPI_OMP_BASELINE -Wl,-rpath,$MKL_HOME/lib/intel64"
-export ASAN_OPTIONS=suppressions=no_asan_for_mpi.supp,fast_unwind_on_malloc=0
-export LSAN_OPTIONS=suppressions=no_lsan_for_mpi.supp
+export ASAN_OPTIONS=suppressions=./ci_test_scripts/no_asan_for_mpi.supp,fast_unwind_on_malloc=0
+export LSAN_OPTIONS=suppressions=./ci_test_scripts/no_lsan_for_mpi.supp
fi
diff --git a/ci_test_scripts/generate_gitlab_ci_tests.py b/ci_test_scripts/generate_gitlab_ci_tests.py
index 57807974..7f4df57d 100755
--- a/ci_test_scripts/generate_gitlab_ci_tests.py
+++ b/ci_test_scripts/generate_gitlab_ci_tests.py
@@ -260,6 +260,7 @@ print(" - echo \"This test will run with matrix size na = $MATRIX_SIZE, nev= $N
print(" - export SKIP_STEP=0")
print(" - ./autogen.sh")
print(" - export SKIP_STEP=0")
+print(" - source /etc/profile.d/modules.sh && . ./ci_test_scripts/.ci-env-vars")
print("\n\n")
--
GitLab