diff --git a/gitlab/docs.sh b/gitlab/docs.sh index d2a62c3f7cd34ba6ca10eddded1daf66e21acf3f..a21203d86e7662c25c437ce247065508643937e7 100755 --- a/gitlab/docs.sh +++ b/gitlab/docs.sh @@ -15,4 +15,4 @@ echo "runner=${CI_RUNNER_DESCRIPTION}" >> ${info} file=${CI_PROJECT_NAME}-${CI_BUILD_REF}.tar.bz2 run_cmd tar cfj ${file} sphinx -doc_upload ${file} software/bob/docs-upload/ +dav_upload ${file} public-upload/docs/incoming diff --git a/gitlab/functions.sh b/gitlab/functions.sh index baef86f8c97f3bf0ea5d711b1f8e1d40cfbaa680..6f3f6260914a0a34e15b8c0e80b4fddcefa97668 100644 --- a/gitlab/functions.sh +++ b/gitlab/functions.sh @@ -163,8 +163,8 @@ setup_deploy() { # Uploads a file to our intranet location via curl # $1: Path to the file to upload (e.g. dist/myfile.whl) -# $2: Path on the server to upload to (e.g. wheels-upload/gitlab/) -doc_upload() { +# $2: Path on the server to upload to (e.g. private-upload/wheels/gitlab/) +dav_upload() { log_info "curl: ${1} -> ${DOCSERVER}/${2}..." local code=`curl --location --silent --fail --write-out "%{http_code}" --user "${DOCUSER}:${DOCPASS}" --upload-file ${1} ${DOCSERVER}/${2}` if [[ ${code} == *204 || ${code} == *201 ]]; then diff --git a/gitlab/wheels.sh b/gitlab/wheels.sh index 738213415fc325bf2c434f8a10ade9024a8eb236..25b13d242a43cac50e8b261d65320afc025aacc0 100755 --- a/gitlab/wheels.sh +++ b/gitlab/wheels.sh @@ -4,5 +4,5 @@ source $(dirname ${0})/functions.sh for file in dist/*.whl; do - doc_upload ${file} wheels-upload/gitlab/ + dav_upload ${file} private-upload/wheels/gitlab/ done