Testing ci

.gitlab-ci.yml

@@ -19,9 +19,9 @@ stages:
     - git clean -ffdx
     - chmod 755 ci/install.sh
     - ./ci/install.sh ci #updates
-    - ./ci/before_build.sh 0
+    - ./ci/before_build.sh 1 buildout-bob.cfg
   script:
-    - ./ci/build.sh buildout-bob.cfg
+    - ./ci/build.sh
   after_script:
     - ./ci/after_build.sh
   artifacts:

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\?://;;'`
@@ -49,14 +50,15 @@ if [ "$PIPINSTALL" == 1]; then
   if [ -e requirements-bob.txt ]; then
     run_cmd ${use_pip} install ${PIPOPTS} --requirement requirements-bob.txt
   else
-    log_info "No requirements.txt file found, skipping 'pip install <build-deps>'..."
+    log_info "No requirements-bob.txt file found, skipping 'pip install <build-deps>'..."
   fi
+fi
 
-  # Finally, bootstrap the installation from the new environment
-  if [ -e bootstrap-buildout.py ]; then
-    run_cmd ${use_python} bootstrap-buildout.py
-  else
-    log_error "No bootstrap-buildout.py file found, stopping..."
-    exit 1
-  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}
+else
+  log_error "No bootstrap-buildout.py file found, stopping..."
+  exit 1
 fi
+

ci/build.sh

@@ -3,7 +3,7 @@
 
 source $(dirname ${0})/functions.sh
 
-run_cmd ./bin/buildout -c ${1}
+run_cmd ./bin/buildout
 
 if [ -x ./bin/bob_dbmanage.py ]; then
   run_cmd ./bin/bob_dbmanage.py all download --force;