openstack/project-config
Code Issues Proposed changes

Retry twine uploads in a loop

Browse Source 
Now that we have a mechanism to check whether twine uploaded
successfully, we can also safely retry it when it doesn't. Try to
upload to PyPI up to three times, waiting progressively longer
between retries.

Change-Id: Id16909501d8ed2387daae71f75cf80de28297baf
This commit is contained in:
Jeremy Stanley 2016-02-18 21:09:16 +00:00
parent 16b12ba5b9
commit 9ee3e76a66
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jenkins/scripts/pypi-tarball-upload.sh
View File

@ -34,6 +34,21 @@ curl --fail -o $FILENAME http://$TARBALL_SITE/$PROJECT/$FILENAME
file -b $FILENAME | grep gzip
# Uploads may claim to fail but actually succeed so we check if we
# can download after upload to determine success.
twine upload -r pypi $FILENAME || true
curl --head --silent --fail "https://pypi.python.org/simple/$PROJECT/$FILENAME" >/dev/null 2>&1
# can download after upload to determine success. They can also fail
# intermittently, so retrying in a delayed loop helps improve
# robustness.
TRY=0
RETVAL=255
set +e
while [[ $TRY -lt 3 ]] && [[ $RETVAL -ne 0 ]]; do
twine upload -r pypi $FILENAME
curl --head --silent --fail \
"https://pypi.python.org/simple/$PROJECT/$FILENAME" >/dev/null 2>&1
RETVAL=$?
(( TRY++ ))
if [[ $TRY -lt 3 ]] && [[ $RETVAL -ne 0 ]]; then
echo "Upload failed, retrying in $TRY seconds." >&2
sleep $TRY
fi
done
exit $RETVAL

21
jenkins/scripts/pypi-wheel-upload.sh
View File

@ -36,6 +36,21 @@ curl --fail -o $FILENAME http://$TARBALL_SITE/$PROJECT/$FILENAME
file -b $FILENAME | grep -i zip
# Uploads may claim to fail but actually succeed so we check if we
# can download after upload to determine success.
twine upload -r pypi $FILENAME || true
curl --head --silent --fail "https://pypi.python.org/simple/$PROJECT/$FILENAME" >/dev/null 2>&1
# can download after upload to determine success. They can also fail
# intermittently, so retrying in a delayed loop helps improve
# robustness.
TRY=0
RETVAL=255
set +e
while [[ $TRY -lt 3 ]] && [[ $RETVAL -ne 0 ]]; do
twine upload -r pypi $FILENAME
curl --head --silent --fail \
"https://pypi.python.org/simple/$PROJECT/$FILENAME" >/dev/null 2>&1
RETVAL=$?
(( TRY++ ))
if [[ $TRY -lt 3 ]] && [[ $RETVAL -ne 0 ]]; then
echo "Upload failed, retrying in $TRY seconds." >&2
sleep $TRY
fi
done
exit $RETVAL