diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index feef93ea766395be55cb9d2ab93fc099fa7372f3..aab83f95c02bafa08e1d1b2b81dc0728a2b19963 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ stages: stage: buildbob before_script: - git clean -ffdx - - ./ci/before_build.sh 1 + - ./ci/before_build.sh 1 buildout-bob.cfg script: - ./ci/build.sh buildout-bob.cfg after_script: diff --git a/ci/before_build.sh b/ci/before_build.sh index 31dd947944715048fddb082d181ab24dc8fe6db6..94bdf880f2a9b4472aea3d835ee078706da5ad10 100755 --- a/ci/before_build.sh +++ b/ci/before_build.sh @@ -4,6 +4,7 @@ source $(dirname ${0})/functions.sh PIPINSTALL=$1 +CONFIG_FILE=$2 WHEELS_REPOSITORY="${DOCSERVER}/software/bob/wheels/gitlab/" WHEELS_SERVER=`echo ${DOCSERVER} | sed 's;https\?://;;'` @@ -55,7 +56,7 @@ fi # Finally, bootstrap the installation from the new environment if [ -e bootstrap-buildout.py ]; then - run_cmd ${use_python} bootstrap-buildout.py + run_cmd ${use_python} bootstrap-buildout.py -c ${CONFIG_FILE} else log_error "No bootstrap-buildout.py file found, stopping..." exit 1