From 61c42e5e2bd0877a30d3f0d3481d17ba128eb78b Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Mon, 13 Mar 2017 12:04:02 +0100
Subject: [PATCH] No need to bootstrap buildout anymore, zc.buildout is shipped
with bob-devel environment (addresses #45)
---
gitlab/before_build.sh | 8 --------
gitlab/before_deploy.sh | 9 ++++++++-
gitlab/build.sh | 10 +++++++++-
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/gitlab/before_build.sh b/gitlab/before_build.sh
index 47538e6..b95a814 100755
--- a/gitlab/before_build.sh
+++ b/gitlab/before_build.sh
@@ -61,11 +61,3 @@ if [ -e test-requirements.txt ]; then
else
log_info "No test-requirements.txt file found, skipping 'pip install <test-deps>'..."
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
diff --git a/gitlab/before_deploy.sh b/gitlab/before_deploy.sh
index cac8108..1f12ae8 100755
--- a/gitlab/before_deploy.sh
+++ b/gitlab/before_deploy.sh
@@ -8,7 +8,14 @@ run_cmd $(dirname ${0})/before_test.sh
# setup database locally and run `bob_dbmanage.py all download`
# if this is a database package - need auxiliary file for package
if [[ ${CI_PROJECT_NAME} == bob.db.* ]]; then
- run_cmd ./bin/buildout
+ use_buildout=`which buildout`
+ if [ -z "${use_buildout}" ]; then
+ log_error "Cannot find buildout, aborting..."
+ exit 1
+ else
+ log_info "Using buildout: ${use_buildout}"
+ fi
+ run_cmd ${use_buildout}
if [ -x ./bin/bob_dbmanage.py ]; then
run_cmd ./bin/bob_dbmanage.py all download --force;
fi
diff --git a/gitlab/build.sh b/gitlab/build.sh
index 1c6ec16..3af02af 100755
--- a/gitlab/build.sh
+++ b/gitlab/build.sh
@@ -5,7 +5,15 @@ source $(dirname ${0})/functions.sh
prepare_build_env ${CONDA_FOLDER} ${PREFIX}
-run_cmd ./bin/buildout
+use_buildout=`which buildout`
+if [ -z "${use_buildout}" ]; then
+ log_error "Cannot find buildout, aborting..."
+ exit 1
+else
+ log_info "Using buildout: ${use_buildout}"
+fi
+
+run_cmd ${use_buildout}
if [ -x ./bin/bob_dbmanage.py ]; then
run_cmd ./bin/bob_dbmanage.py all download --missing;
--
GitLab