mirror of
https://github.com/xcp-ng/xenadmin.git
synced 2024-11-24 22:06:59 +01:00
corrected checkout of xenadmin.hg when it does not exists.
This commit is contained in:
parent
71882d15b2
commit
dc84e81662
13
mk/build.sh
13
mk/build.sh
@ -47,19 +47,6 @@ fi
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
ROOT_DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
|
ROOT_DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
|
||||||
cd ${ROOT_DIR}
|
|
||||||
#DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
|
||||||
|
|
||||||
# now we are sure we are running from the branch root
|
|
||||||
#cd ${DIR}/../..
|
|
||||||
|
|
||||||
|
|
||||||
if [ -d "xenadmin-ref.hg" ]
|
|
||||||
then
|
|
||||||
hg --cwd xenadmin-ref.hg pull -u
|
|
||||||
else
|
|
||||||
hg clone ssh://xenhg@hg.uk.xensource.com/carbon/${XS_BRANCH}/xenadmin-ref.hg/
|
|
||||||
fi
|
|
||||||
|
|
||||||
production_jenkins_build()
|
production_jenkins_build()
|
||||||
{
|
{
|
||||||
|
@ -89,6 +89,14 @@ fi
|
|||||||
XS_BRANCH=`cd $DIR;git config --get remote.origin.url|sed -e 's@.*carbon/\(.*\)/xenadmin.git.*@\1@'`
|
XS_BRANCH=`cd $DIR;git config --get remote.origin.url|sed -e 's@.*carbon/\(.*\)/xenadmin.git.*@\1@'`
|
||||||
echo Running on branch: $XS_BRANCH
|
echo Running on branch: $XS_BRANCH
|
||||||
|
|
||||||
|
cd ${ROOT_DIR}
|
||||||
|
if [ -d "xenadmin-ref.hg" ]
|
||||||
|
then
|
||||||
|
hg --cwd xenadmin-ref.hg pull -u
|
||||||
|
else
|
||||||
|
hg clone ssh://xenhg@hg.uk.xensource.com/carbon/${XS_BRANCH}/xenadmin-ref.hg/
|
||||||
|
fi
|
||||||
|
|
||||||
#rename Jenkins environment variables to distinguish them from ours; remember to use them as get only
|
#rename Jenkins environment variables to distinguish them from ours; remember to use them as get only
|
||||||
get_JOB_NAME=${JOB_NAME}
|
get_JOB_NAME=${JOB_NAME}
|
||||||
get_BUILD_NUMBER=${BUILD_NUMBER}
|
get_BUILD_NUMBER=${BUILD_NUMBER}
|
||||||
|
Loading…
Reference in New Issue
Block a user