diff --git a/gitlab/functions.sh b/gitlab/functions.sh index 6826eec915d538cc4c1067f7c9248a9a2c0be3ec..35479da19f45bef7d810829b24ae06aa2788d1af 100644 --- a/gitlab/functions.sh +++ b/gitlab/functions.sh @@ -202,8 +202,8 @@ if [ -z "${CONDA_FOLDER}" ]; then CONDA_FOLDER=/opt/conda fi -if [ -z "${CONDA_PREFIX}" ]; then - CONDA_PREFIX=env +if [ -z "${VIRTUALENV_PATH}" ]; then + VIRTUALENV_PATH=env fi if [ -z "${DOCSERVER}" ]; then @@ -211,7 +211,7 @@ if [ -z "${DOCSERVER}" ]; then export_env DOCSERVER fi -PREFIX=${CI_PROJECT_DIR}/${CONDA_PREFIX} +PREFIX=${CI_PROJECT_DIR}/${VIRTUALENV_PATH} if [ "${ARCH}" == "linux" ]; then # Temporary hack to get building done right with gcc-5 compilers @@ -252,7 +252,7 @@ check_env DOCSERVER check_env PYPISERVER check_env TESTSERVER check_env CONDA_FOLDER -check_env CONDA_PREFIX +check_env VIRTUALENV_PATH export_env LD_LIBRARY_PATH export_env BOB_PREFIX_PATH