openstack/monasca-persister
Code Issues Proposed changes

Ensure the same branch is used for common build

Browse Source 
Only the master branch is used today, but be ready when there
are additional branches

Change-Id: I77c9265c3c23dfcf04bb77db01527cc0b12cccfb
This commit is contained in:
Craig Bryant 2016-02-08 11:55:46 -07:00
parent b544aa5ba8
commit 7ac987b59d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/build_common.sh
View File

@ -4,6 +4,7 @@ ME=`whoami`
echo "Running as user: $ME" echo "Running as user: $ME"
MVN=$1 MVN=$1
VERSION=$2 VERSION=$2
BRANCH=$3
check_user() { check_user() {
ME=$1 ME=$1
@ -22,7 +23,7 @@ fi
# This should only be done on the stack forge system # This should only be done on the stack forge system
if [ "${BUILD_COMMON}" = "true" ]; then if [ "${BUILD_COMMON}" = "true" ]; then
git clone https://github.com/openstack/monasca-common git clone -b ${BRANCH} https://git.openstack.org/openstack/monasca-common
cd monasca-common cd monasca-common
${MVN} clean ${MVN} clean
${MVN} install ${MVN} install

10
run_maven.sh
View File

@ -1,4 +1,6 @@
#!/bin/bash #!/bin/bash
set -x
env
# Download maven 3 if the system maven isn't maven 3 # Download maven 3 if the system maven isn't maven 3
VERSION=`mvn -v | grep "Apache Maven 3"` VERSION=`mvn -v | grep "Apache Maven 3"`
if [ -z "${VERSION}" ]; then if [ -z "${VERSION}" ]; then
@ -28,7 +30,13 @@ for ARG in $*; do
done done
if [ $RUN_BUILD = "true" ]; then if [ $RUN_BUILD = "true" ]; then
( cd common; ./build_common.sh ${MVN} ${COMMON_VERSION} ) if [ ! -z "$ZUUL_BRANCH" ]; then
BRANCH=${ZUUL_BRANCH}
else
BRANCH=${ZUUL_REF}
fi
( cd common; ./build_common.sh ${MVN} ${COMMON_VERSION} ${BRANCH} )
RC=$? RC=$?
if [ $RC != 0 ]; then if [ $RC != 0 ]; then
exit $RC exit $RC