openstack
/
fuel-mirror
Code Issues Proposed changes

[Perestroika] Fix issues with simple command line builder 

1. Check exit status from build environment, in order to correctly
fail in case of non-zero result

2. Fix path check for centos7 docker cache, also fixing [1]

3. Correctly pass DIST to updated/create/build process

[1]. https://github.com/koalaman/shellcheck/wiki/SC2144

Change-Id: Ifc41c801bae8575caed50cc7359a8e1215e0d9a7
This commit is contained in:
Sergey Kulanov 2015-12-05 18:47:41 +02:00
parent 8d945c9cd3
commit 6534117233
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
perestroika/build-package.sh
View File

@ -117,6 +117,7 @@ update_buildroot() {
main () {
case "$BUILD_TARGET" in
trusty)
export DIST="${BUILD_TARGET}"
if [[ "$(docker images -q sbuild 2> /dev/null)" == "" ]]; then
build_docker_image
create_buildroot
@ -127,7 +128,9 @@ case "$BUILD_TARGET" in
update_buildroot
fi
fi
cd "${BUILD_SOURCE}" && DIST="${BUILD_TARGET}"; "${WORKING_DIR}"/docker-builder/build-deb-package.sh
cd "${BUILD_SOURCE}"
bash -ex "${WORKING_DIR}"/docker-builder/build-deb-package.sh
local exitstatus=`cat buildresult/exitstatus.sbuild || echo 1`
if [[ "${OUTPUT_DIR}" != "" ]]; then
mkdir -p "${OUTPUT_DIR}"
mv buildresult/* "${OUTPUT_DIR}"
@ -135,17 +138,20 @@ case "$BUILD_TARGET" in
fi
;;
centos7)
export DIST="${BUILD_TARGET}"
if [[ "$(docker images -q mockbuild 2> /dev/null)" == "" ]]; then
build_docker_image
create_buildroot
else
if [[ ! -d /var/cache/docker-builder/mock/cache/*-"${BUILD_TARGET}"-x86_64 ]]; then
if [[ ! -d /var/cache/docker-builder/mock/cache/epel-7-x86_64 ]]; then
create_buildroot
else
update_buildroot
fi
fi
cd "${BUILD_SOURCE}" && DIST="${BUILD_TARGET}"; "${WORKING_DIR}"/docker-builder/build-rpm-package.sh
cd "${BUILD_SOURCE}"
bash -ex "${WORKING_DIR}"/docker-builder/build-rpm-package.sh
local exitstatus=`cat build/exitstatus.mock || echo 1`
if [[ "${OUTPUT_DIR}" != "" ]]; then
mkdir -p "${OUTPUT_DIR}"
mv build/* "${OUTPUT_DIR}"
@ -154,6 +160,8 @@ case "$BUILD_TARGET" in
;;
*) die "Unknown build target specified. Currently 'trusty' and 'centos7' are supported"
esac
exit "${exitstatus}"
}
main "${@}"