diff --git a/gitlab/before_deploy.sh b/gitlab/before_deploy.sh index 5371267557b6cafd5d40f3135ecb8a74498e795c..cac81087be5533b36b8ab026d458748b8f607f25 100755 --- a/gitlab/before_deploy.sh +++ b/gitlab/before_deploy.sh @@ -1,22 +1,15 @@ #!/usr/bin/env bash # Wed 21 Sep 2016 13:08:05 CEST -# Parameters: -# -# $1: database name to run the download command for. If unset, use "all" -# - source $(dirname ${0})/functions.sh run_cmd $(dirname ${0})/before_test.sh -dbname=${1:-all} - # 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 if [ -x ./bin/bob_dbmanage.py ]; then - run_cmd ./bin/bob_dbmanage.py ${dbname} download --force; + run_cmd ./bin/bob_dbmanage.py all download --force; fi fi diff --git a/gitlab/build.sh b/gitlab/build.sh index 6e94d1e7c46e32bce8142a50822d391fd317a1da..6d45957122a54ece216884168058bb796aed9c73 100644 --- a/gitlab/build.sh +++ b/gitlab/build.sh @@ -1,19 +1,12 @@ #!/usr/bin/env bash -# Tue 13 Dec 2016 17:36:51 CET - -# Parameters: -# -# $1: database name to run the download command for. If unset, use "all" -# +# Wed 21 Sep 2016 13:08:05 CEST source $(dirname ${0})/functions.sh run_cmd ./bin/buildout -dbname=${1:-all} - if [ -x ./bin/bob_dbmanage.py ]; then - run_cmd ./bin/bob_dbmanage.py ${dbname} download --force; + run_cmd ./bin/bob_dbmanage.py all download --force; fi if [ -d ./doc ]; then