5f12e27897
If you start with an out of date repo (we do -- we clone from cached git repos on our images) and the git remote update fails (eg due to mirror sync issues) and you then do a fetch with a ref argument (eg refs/tags/foo), it will fail with: error: no such remote ref refs/tags/foo However, git fetch --tags will get all the tags from the zuul merger, which is what we really care about, and the subsequent checkout and reset will make sure that we really did get the tag we wanted. Therefore, remove the ref argument that can cause these occasional failures. Change-Id: Iaed8b82204a3eddc7ee418ebe94637f2a371d25b
98 lines
1.9 KiB
Bash
Executable File
98 lines
1.9 KiB
Bash
Executable File
#!/bin/bash -e
|
|
|
|
GERRIT_SITE=$1
|
|
GIT_ORIGIN=$2
|
|
|
|
if [ -z "$GERRIT_SITE" ]
|
|
then
|
|
echo "The gerrit site name (eg 'https://review.openstack.org') must be the first argument."
|
|
exit 1
|
|
fi
|
|
|
|
if [ -z "$ZUUL_URL" ]
|
|
then
|
|
echo "The ZUUL_URL must be provided."
|
|
exit 1
|
|
fi
|
|
|
|
if [ -z "$GIT_ORIGIN" ] || [ -n "$ZUUL_NEWREV" ]
|
|
then
|
|
GIT_ORIGIN="$GERRIT_SITE/p"
|
|
# git://git.openstack.org/
|
|
# https://review.openstack.org/p
|
|
fi
|
|
|
|
if [ -z "$ZUUL_REF" ]
|
|
then
|
|
if [ -n "$BRANCH" ]
|
|
then
|
|
echo "No ZUUL_REF so using requested branch $BRANCH from origin."
|
|
ZUUL_REF=$BRANCH
|
|
# use the origin since zuul mergers have outdated branches
|
|
ZUUL_URL=$GIT_ORIGIN
|
|
else
|
|
echo "Provide either ZUUL_REF or BRANCH in the calling enviromnent."
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
if [ ! -z "$ZUUL_CHANGE" ]
|
|
then
|
|
echo "Triggered by: $GERRIT_SITE/$ZUUL_CHANGE"
|
|
fi
|
|
|
|
set -x
|
|
if [[ ! -e .git ]]
|
|
then
|
|
ls -a
|
|
rm -fr .[^.]* *
|
|
if [ -d /opt/git/$ZUUL_PROJECT/.git ]
|
|
then
|
|
git clone file:///opt/git/$ZUUL_PROJECT .
|
|
else
|
|
git clone $GIT_ORIGIN/$ZUUL_PROJECT .
|
|
fi
|
|
fi
|
|
git remote set-url origin $GIT_ORIGIN/$ZUUL_PROJECT
|
|
|
|
# attempt to work around bugs 925790 and 1229352
|
|
if ! git remote update
|
|
then
|
|
echo "The remote update failed, so garbage collecting before trying again."
|
|
git gc
|
|
git remote update
|
|
fi
|
|
|
|
git reset --hard
|
|
if ! git clean -x -f -d -q ; then
|
|
sleep 1
|
|
git clean -x -f -d -q
|
|
fi
|
|
|
|
if echo "$ZUUL_REF" | grep -q ^refs/tags/
|
|
then
|
|
git fetch --tags $ZUUL_URL/$ZUUL_PROJECT
|
|
git checkout $ZUUL_REF
|
|
git reset --hard $ZUUL_REF
|
|
elif [ -z "$ZUUL_NEWREV" ]
|
|
then
|
|
git fetch $ZUUL_URL/$ZUUL_PROJECT $ZUUL_REF
|
|
git checkout FETCH_HEAD
|
|
git reset --hard FETCH_HEAD
|
|
else
|
|
git checkout $ZUUL_NEWREV
|
|
git reset --hard $ZUUL_NEWREV
|
|
fi
|
|
|
|
if ! git clean -x -f -d -q ; then
|
|
sleep 1
|
|
git clean -x -f -d -q
|
|
fi
|
|
|
|
if [ -f .gitmodules ]
|
|
then
|
|
git submodule init
|
|
git submodule sync
|
|
git submodule update --init
|
|
fi
|