From 89163b90bc258daa6aeb037aa385feb43d07b1e1 Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Sun, 20 Nov 2016 20:44:39 +0100
Subject: [PATCH] Testing ci
---
.gitlab-ci.yml | 2 +-
ci/before_build.sh | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index feef93e..aab83f9 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 31dd947..94bdf88 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
--
GitLab