x/packetary
Code Issues Proposed changes

[Perestroika] Allow to build package with absolute path

Browse Source 
Since we can call package building in form [1]:
   bash build-fuel-{pkg_type}.sh

we need to use more robust way to define absolute path to
perestroika ${ROOT}

[1]. https://github.com/fuel-infra/jenkins-jobs/blob/master/\
     servers/pkgs-ci/fuel-pkg-pipeline.yaml#L104

Change-Id: I21c6cae2fee7c67e3849b65ecca49ca1714c007a
This commit is contained in:
Sergey Kulanov 2015-11-30 14:18:57 +02:00
parent f3c84d7338
commit 3cb98030d4
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
perestroika/build-deb.sh
View File

@ -4,7 +4,8 @@ set -o xtrace
set -o errexit
[ -f ".packages-defaults" ] && source .packages-defaults
source build-functions.sh
BINDIR=$(dirname `readlink -e $0`)
source "${BINDIR}"/build-functions.sh
main () {
set_default_params
@ -120,7 +121,7 @@ main () {
pushd $BUILDDIR &>/dev/null
echo "BUILD_SUCCEEDED=false" > ${WRKDIR}/buildresult.params
bash -ex ${WRKDIR}/docker-builder/build-deb-package.sh
bash -ex ${BINDIR}/docker-builder/build-deb-package.sh
local exitstatus=`cat buildresult/exitstatus.sbuild || echo 1`
rm -f buildresult/exitstatus.sbuild
[ -f "buildresult/buildlog.sbuild" ] && mv buildresult/buildlog.sbuild ${WRKDIR}/buildlog.txt

5
perestroika/build-fuel-deb.sh
View File

@ -4,7 +4,8 @@ set -o xtrace
set -o errexit
[ -f .fuel-default ] && source .fuel-default
source $(dirname `readlink -e $0`)/build-functions.sh
BINDIR=$(dirname `readlink -e $0`)
source "${BINDIR}"/build-functions.sh
main () {
set_default_params
@ -82,7 +83,7 @@ main () {
pushd $BUILDDIR &>/dev/null
echo "BUILD_SUCCEEDED=false" > ${WRKDIR}/buildresult.params
bash -ex ${WRKDIR}/docker-builder/build-deb-package.sh
bash -ex ${BINDIR}/docker-builder/build-deb-package.sh
local exitstatus=`cat buildresult/exitstatus.sbuild || echo 1`
rm -f buildresult/exitstatus.sbuild
[ -f "buildresult/buildlog.sbuild" ] && mv buildresult/buildlog.sbuild ${WRKDIR}/buildlog.txt

5
perestroika/build-fuel-rpm.sh
View File

@ -4,7 +4,8 @@ set -o xtrace
set -o errexit
[ -f .fuel-default ] && source .fuel-default
source $(dirname `readlink -e $0`)/build-functions.sh
BINDIR=$(dirname `readlink -e $0`)
source "${BINDIR}"/build-functions.sh
main () {
set_default_params
@ -85,7 +86,7 @@ main () {
pushd $BUILDDIR &>/dev/null
echo "BUILD_SUCCEEDED=false" > ${WRKDIR}/buildresult.params
bash -x ${WRKDIR}/docker-builder/build-rpm-package.sh
bash -x ${BINDIR}/docker-builder/build-rpm-package.sh
local exitstatus=`cat build/exitstatus.mock || echo 1`
rm -f build/exitstatus.mock build/state.log
[ -f "build/build.log" ] && mv build/build.log ${WRKDIR}/buildlog.txt

5
perestroika/build-rpm.sh
View File

@ -4,7 +4,8 @@ set -o xtrace
set -o errexit
[ -f ".packages-defaults" ] && source .packages-defaults
source build-functions.sh
BINDIR=$(dirname `readlink -e $0`)
source "${BINDIR}"/build-functions.sh
main () {
set_default_params
@ -127,7 +128,7 @@ This package provides the %{-n*} kernel modules
pushd $BUILDDIR &>/dev/null
echo "BUILD_SUCCEEDED=false" > ${WRKDIR}/buildresult.params
bash -x ${WRKDIR}/docker-builder/build-rpm-package.sh
bash -x ${BINDIR}/docker-builder/build-rpm-package.sh
local exitstatus=`cat build/exitstatus.mock || echo 1`
rm -f build/exitstatus.mock build/state.log
[ -f "build/build.log" ] && mv build/build.log ${WRKDIR}/buildlog.txt