Testing ci

.gitlab-ci.yml

@@ -17,9 +17,9 @@ stages:
   stage: buildbob
   before_script:
     - git clean -ffdx
-    - ./ci/before_build.sh 1 buildout-bob.cfg
+    - ./ci/before_build.sh 1
   script:
-    - ./ci/build.sh
+    - ./ci/build.sh buildout-bob.cfg
   after_script:
     - ./ci/after_build.sh
   artifacts:

ci/before_build.sh

@@ -4,7 +4,6 @@
 source $(dirname ${0})/functions.sh
 
 PIPINSTALL=$1
-CONFIG_FILE=$2
 
 WHEELS_REPOSITORY="${DOCSERVER}/software/bob/wheels/gitlab/"
 WHEELS_SERVER=`echo ${DOCSERVER} | sed 's;https\?://;;'`
@@ -56,7 +55,7 @@ fi
 
 # Finally, bootstrap the installation from the new environment
 if [ -e bootstrap-buildout.py ]; then
-  run_cmd ${use_python} bootstrap-buildout.py -c ${CONFIG_FILE}
+  run_cmd ${use_python} bootstrap-buildout.py
 else
   log_error "No bootstrap-buildout.py file found, stopping..."
   exit 1

ci/build.sh

@@ -2,8 +2,10 @@
 # Wed 21 Sep 2016 13:08:05 CEST
 
 source $(dirname ${0})/functions.sh
+CONFIG_FILE=$1
 
-run_cmd ./bin/buildout
+
+run_cmd ./bin/buildout -c ${CONFIG_FILE}
 
 if [ -x ./bin/bob_dbmanage.py ]; then
   run_cmd ./bin/bob_dbmanage.py all download --force;