diff --git a/gitlab/after_build.sh b/gitlab/after_build.sh index fd14ce964a3cab326e87b929df26090395eb5692..65b76f04822998484363fa720f389e71d2191c61 100755 --- a/gitlab/after_build.sh +++ b/gitlab/after_build.sh @@ -3,6 +3,5 @@ source $(dirname ${0})/functions.sh -check_env CONDA_PREFIX run_cmd rm -rf ${CONDA_PREFIX} run_cmd rm -rf install.sh diff --git a/gitlab/after_deploy.sh b/gitlab/after_deploy.sh index ac195c7ebb08169df684edfd8fa505b70c01059c..0132dd75e2c6431f25b99397abb54787f8dedea6 100755 --- a/gitlab/after_deploy.sh +++ b/gitlab/after_deploy.sh @@ -4,5 +4,4 @@ source $(dirname ${0})/functions.sh run_cmd rm -rf ~/.pypirc -check_env CONDA_PREFIX run_cmd rm -rf ${CONDA_PREFIX} diff --git a/gitlab/after_test.sh b/gitlab/after_test.sh index 743024b0955cbfe0bf1a5104b37fcf9fb3c46add..7dbf80ecceda20c85cdb3281df15292bfa926793 100755 --- a/gitlab/after_test.sh +++ b/gitlab/after_test.sh @@ -3,5 +3,4 @@ source $(dirname ${0})/functions.sh -check_env CONDA_PREFIX run_cmd rm -rf ${CONDA_PREFIX} diff --git a/gitlab/before_build.sh b/gitlab/before_build.sh index e5f75a6ae1dac7ffafe8a678d73ed0cf8931f6aa..f472afc71b3879c85a9700c1f47db25be33c769a 100755 --- a/gitlab/before_build.sh +++ b/gitlab/before_build.sh @@ -3,22 +3,15 @@ source $(dirname ${0})/functions.sh -check_env DOCSERVER -check_env CONDA_FOLDER -check_env PYTHON_VER -check_env CONDA_PREFIX -check_env ARCH -check_env PREFIX -check_env CI_PROJECT_NAME - WHEELS_REPOSITORY="${DOCSERVER}/software/bob/wheels/gitlab/" WHEELS_SERVER=`echo ${DOCSERVER} | sed 's;https\?://;;'` +check_env WHEELS_REPOSITORY +check_env WHEELS_SERVER # Clones the conda dev environment to use if [ ! -d ${PREFIX} ]; then log_info "Downloading environment list into file \`env.txt'..." - pyver=$(echo ${PYTHON_VER} | tr -d '.') - run_cmd curl --silent --output env.txt https://gitlab.idiap.ch/bob/bob.admin/raw/master/install/${ARCH}/devel-py${pyver}.txt + run_cmd curl --silent --output env.txt https://gitlab.idiap.ch/bob/bob.admin/raw/master/install/${ARCH}/devel-${PYVER}.txt log_info "Bootstrapping conda installation at ${PREFIX}..." run_cmd ${CONDA_FOLDER}/bin/conda clean --lock run_cmd ${CONDA_FOLDER}/bin/conda create --prefix ${PREFIX} --file env.txt --yes diff --git a/gitlab/before_test.sh b/gitlab/before_test.sh index 4d56e5d14956d2d91f627a902b0b7aa42a6befb2..e348f8dc50610aa7a9ae6c00646f773c6d07ed38 100755 --- a/gitlab/before_test.sh +++ b/gitlab/before_test.sh @@ -3,14 +3,6 @@ source $(dirname ${0})/functions.sh -check_env DOCSERVER -check_env CONDA_PREFIX -check_env CI_PROJECT_NAME -check_env CI_PROJECT_DIR - -BOB_DOCUMENTATION_SERVER="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/" -PREFIX=${CI_PROJECT_DIR}/${CONDA_PREFIX} - run_cmd $(dirname ${0})/before_build.sh # Source the newly created conda environment diff --git a/gitlab/build.sh b/gitlab/build.sh index 68c6251b2b3809c393444505470b6a92ab23d78e..a31680ac432fcd386a0574380223f061646a38d4 100755 --- a/gitlab/build.sh +++ b/gitlab/build.sh @@ -3,14 +3,6 @@ source $(dirname ${0})/functions.sh -check_env DOCSERVER -check_env CONDA_FOLDER -check_env PYTHON_VER - -BOB_DOCUMENTATION_SERVER="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/" -pyver=$(echo ${PYTHON_VER} | tr -d '.') -BOB_PREFIX_PATH=${CONDA_FOLDER}/envs/bob-devel-py${pyver} - run_cmd ./bin/buildout if [ -x ./bin/bob_dbmanage.py ]; then diff --git a/gitlab/deploy.sh b/gitlab/deploy.sh index 3703b669aa8eb99dcf6a8f63eb5cd6924df77f68..d3c75722cc4261dc949f54d9107f39033cd7c7d5 100755 --- a/gitlab/deploy.sh +++ b/gitlab/deploy.sh @@ -3,15 +3,6 @@ source $(dirname ${0})/functions.sh -check_env PYPIUSER -check_env CI_BUILD_TAG - -if [ -z "${PYPISERVER}" ]; then - PYPISERVER="https://pypi.python.org" -fi - -TESTSERVER=https://testpypi.python.org - dot_pypirc setup check sdist --formats zip upload --repository staging diff --git a/gitlab/docs.sh b/gitlab/docs.sh index c70203cac98fc4c1de04e2b85e37c17adc715a0a..d2a62c3f7cd34ba6ca10eddded1daf66e21acf3f 100755 --- a/gitlab/docs.sh +++ b/gitlab/docs.sh @@ -12,9 +12,6 @@ echo "build=${CI_BUILD_ID}" >> ${info} echo "commit=${CI_BUILD_REF}" >> ${info} echo "runner=${CI_RUNNER_DESCRIPTION}" >> ${info} -check_env CI_PROJECT_NAME -check_env CI_BUILD_REF - file=${CI_PROJECT_NAME}-${CI_BUILD_REF}.tar.bz2 run_cmd tar cfj ${file} sphinx diff --git a/gitlab/functions.sh b/gitlab/functions.sh index 626f886d51dd52a9af80fd820a1e5c895f969784..9f3c3775650409cbdc9548ece0bf6dc83b49e1c1 100644 --- a/gitlab/functions.sh +++ b/gitlab/functions.sh @@ -63,7 +63,6 @@ run_cmd() { # Runs setup.py setup() { - check_env PREFIX run_cmd ${PREFIX}/bin/python setup.py ${@} } @@ -71,8 +70,6 @@ setup() { # Prepares ~/.pypirc dot_pypirc() { check_env PYPISERVER - check_env PYPIUSER - check_pass PYPIPASS log_info "Creating ~/.pypirc..." cat <<EOT >> ~/.pypirc [distutils] @@ -97,7 +94,7 @@ EOT # Uploads a file to our intranet location via curl doc_upload() { check_env DOCSERVER - check_env DOCUSER + check_pass DOCUSER check_pass DOCPASS log_info "${1} -> ${DOCSERVER}/${2}, via curl..." curl --silent --user "${DOCUSER}:${DOCPASS}" --upload-file ${1} ${DOCSERVER}/${2} @@ -109,12 +106,21 @@ doc_upload() { log_info "Successfully uploaded ${1} with curl" } -# Sets up variables -ARCH=`arch` - -check_env ARCH check_env CONDA_FOLDER +check_env CONDA_PREFIX +check_env PYTHON_VER check_env CI_PROJECT_DIR +check_env CI_PROJECT_PATH +check_env CI_PROJECT_NAME +check_env CI_BUILD_REF +check_env CI_BUILD_REF_NAME +check_pass PYPIUSER +check_pass PYPIPASS +check_pass DOCUSER +check_pass DOCPASS + +# Sets up variables +ARCH=`arch` if [ -z "${CONDA_FOLDER}" ]; then if [ "${ARCH}" == "linux" ]; then @@ -128,6 +134,10 @@ if [ -z "${CONDA_PREFIX}" ]; then CONDA_PREFIX=env fi +if [ -z "${DOCSERVER}" ]; then + DOCSERVER=https://www.idiap.ch +fi + PREFIX=${CI_PROJECT_DIR}/${CONDA_PREFIX} # Add "-coverage" support @@ -147,3 +157,24 @@ else fi CXXFLAGS=${CFLAGS} fi + +PYVER=py$(echo ${PYTHON_VER} | tr -d '.') +BOB_PREFIX_PATH=${CONDA_FOLDER}/envs/bob-devel-${PYVER} +BOB_DOCUMENTATION_SERVER="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/" + +if [ -z "${PYPISERVER}" ]; then + PYPISERVER="https://pypi.python.org" +fi + +TESTSERVER=https://testpypi.python.org + +check_env ARCH +check_env PYVER +check_env PREFIX +check_env CFLAGS +check_env CXXFLAGS +check_env DOCSERVER +check_env PYPISERVER +check_env TESTSERVER +check_env BOB_PREFIX_PATH +check_env BOB_DOCUMENTATION_SERVER diff --git a/gitlab/test.sh b/gitlab/test.sh index c7bab6f9b1e9ad7c625ea1baa2e953cdbfd00316..463c87ebb8a6b73033324de2aeb5a81ea0a95d61 100755 --- a/gitlab/test.sh +++ b/gitlab/test.sh @@ -3,14 +3,6 @@ source $(dirname ${0})/functions.sh -check_env DOCSERVER -check_env CONDA_PREFIX -check_env CI_PROJECT_NAME -check_env CI_PROJECT_DIR - -BOB_DOCUMENTATION_SERVER="${DOCSERVER}/software/bob/docs/latest/bob/%s/master/" -PREFIX=${CI_PROJECT_DIR}/${CONDA_PREFIX} - run_cmd cd ${PREFIX} # The tests: