opendev
/
system-config
Code Issues Proposed changes

Retry git clones in install_modules.sh 

github is making it impossible to land changes in system-config. That is
dangerous. So add in a short retry loop to the git clones.

Change-Id: Ie49ae930f93aa9740e40e42935782823ed4dde35
This commit is contained in:
Monty Taylor 2015-11-27 16:22:43 -05:00
parent 808cb9a785
commit 002e9b5b31
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
install_modules.sh
View File

@ -17,6 +17,7 @@
MODULE_PATH=`puppet config print modulepath | cut -d ':' -f 1`
SCRIPT_NAME=$(basename $0)
SCRIPT_DIR=$(readlink -f "$(dirname $0)")
JUST_CLONED=0
function remove_module {
local SHORT_MODULE_NAME=$1
@ -27,6 +28,20 @@ function remove_module {
fi
}
function git_clone {
local MOD=$1
local DEST=$2
JUST_CLONED=1
for attempt in $(seq 0 3); do
clone_error=0
git clone $MOD $DEST && break || true
rm -rf $DEST
clone_error=1
done
return $clone_error
}
# Array of modules to be installed key:value is module:version.
declare -A MODULES
@ -59,6 +74,7 @@ MODULE_LIST=`puppet module list --color=false`
# Install modules from source
for MOD in ${!SOURCE_MODULES[*]} ; do
JUST_CLONED=0
# get the name of the module directory
if [ `echo $MOD | awk -F. '{print $NF}'` = 'git' ]; then
echo "Remote repos of the form repo.git are not supported: ${MOD}"
@ -72,21 +88,31 @@ for MOD in ${!SOURCE_MODULES[*]} ; do
# treat any occurrence of the module as a match
if ! echo $MODULE_LIST | grep "${MODULE_NAME}" >/dev/null 2>&1; then
# clone modules that are not installed
git clone $MOD "${MODULE_PATH}/${MODULE_NAME}"
git_clone $MOD "${MODULE_PATH}/${MODULE_NAME}"
else
if [ ! -d ${MODULE_PATH}/${MODULE_NAME}/.git ]; then
echo "Found directory ${MODULE_PATH}/${MODULE_NAME} that is not a git repo, deleting it and reinstalling from source"
remove_module $MODULE_NAME
git clone $MOD "${MODULE_PATH}/${MODULE_NAME}"
git_clone $MOD "${MODULE_PATH}/${MODULE_NAME}"
elif [ `${GIT_CMD_BASE} remote show origin | grep 'Fetch URL' | awk -F'URL: ' '{print $2}'` != $MOD ]; then
echo "Found remote in ${MODULE_PATH}/${MODULE_NAME} that does not match desired remote ${MOD}, deleting dir and re-cloning"
remove_module $MODULE_NAME
git clone $MOD "${MODULE_PATH}/${MODULE_NAME}"
git_clone $MOD "${MODULE_PATH}/${MODULE_NAME}"
fi
fi
# fetch the latest refs from the repo
$GIT_CMD_BASE remote update
if [[ $JUST_CLONED -eq 0 ]] ; then
# If we just cloned the repo, we do not need to remote update
for attempt in $(seq 0 3); do
clone_error=0
$GIT_CMD_BASE remote update && break || true
clone_error=1
done
if [[ $clone_error -ne 0 ]] ; then
exit $clone_error
fi
fi
# make sure the correct revision is installed, I have to use rev-list b/c rev-parse does not work with tags
if [ `${GIT_CMD_BASE} rev-list HEAD --max-count=1` != `${GIT_CMD_BASE} rev-list ${SOURCE_MODULES[$MOD]} --max-count=1` ]; then
# checkout correct revision