Skip to content
Snippets Groups Projects
Commit 8eac4347 authored by hglawe's avatar hglawe
Browse files

Merge branch 'fix-docker-job-env-variables' into 'dev-23a'

set OMP_NUM_THREADS for make checks

See merge request !32
parents fb0a1ad5 1f748810
No related branches found
No related tags found
1 merge request!32set OMP_NUM_THREADS for make checks
...@@ -81,8 +81,9 @@ RUN /bin/bash /home/user/spack-environments/spack_setup.sh -b ${toolchain} ...@@ -81,8 +81,9 @@ RUN /bin/bash /home/user/spack-environments/spack_setup.sh -b ${toolchain}
# If the toolchain variable is 'global' then exit(0) and do nothing else clone octopus, load toolchains and make and test octopus # If the toolchain variable is 'global' then exit(0) and do nothing else clone octopus, load toolchains and make and test octopus
ENV MODULEPATH=/home/user/spack-environments/lmod/Core:/etc/lmod/modules:/usr/share/lmod/lmod/modulefiles ENV MODULEPATH=/home/user/spack-environments/lmod/Core:/etc/lmod/modules:/usr/share/lmod/lmod/modulefiles
ENV MPIEXEC=orterun ENV MPIEXEC=orterun
ENV OMP_NUM_THREADS=2 ENV OMP_NUM_THREADS=1
ENV OCT_TEST_NJOBS=4 ENV OCT_TEST_NJOBS=4
ENV OCT_TEST_MPI_NPROCS=2
RUN if [ "${toolchain}" = "global" ]; \ RUN if [ "${toolchain}" = "global" ]; \
then exit 0; \ then exit 0; \
else \ else \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment