projects
/
fusionforge
/
fusionforge.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c150621
)
Work in progress
author
Roland Mas
<lolando@debian.org>
Thu, 28 Jun 2012 13:21:07 +0000
(13:21 +0000)
committer
Roland Mas
<lolando@debian.org>
Thu, 28 Jun 2012 13:21:07 +0000
(13:21 +0000)
tests/scripts/fusionforge-build-and-test-deb.sh
patch
|
blob
|
history
diff --git
a/tests/scripts/fusionforge-build-and-test-deb.sh
b/tests/scripts/fusionforge-build-and-test-deb.sh
index 83d1689af59449d10189e2b630e0dba75dc44780..236e47c429eb21a6fe5185ac26d2596d7e2bb069 100755
(executable)
--- a/
tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/
tests/scripts/fusionforge-build-and-test-deb.sh
@@
-16,22
+16,20
@@
set -e
set -x
COWBUILDERBASE=/var/lib/jenkins/builder/
set -x
COWBUILDERBASE=/var/lib/jenkins/builder/
-COWBUILDERBUILDPLACE=$COWBUILDERBASE/buildplace
-COWBUILDERCOW=$COWBUILDERBASE/cow/base-$DIST-amd64.cow
COWBUILDERCONFIG=$COWBUILDERBASE/config/$DIST.config
COWBUILDERCONFIG=$COWBUILDERBASE/config/$DIST.config
-#sudo cowbuilder --update --basepath $COWBUILDERCOW --buildplace=$COWBUILDERBASE
-
cat > $COWBUILDERCONFIG <<EOF
PDEBUILD_PBUILDER=cowbuilder
cat > $COWBUILDERCONFIG <<EOF
PDEBUILD_PBUILDER=cowbuilder
-BASEPATH=$COWBUILDER
COW
-BUILDPLACE=$COWBUILDERB
UILDPLACE
+BASEPATH=$COWBUILDER
BASE/cow/base-$DIST-amd64.cow
+BUILDPLACE=$COWBUILDERB
ASE/buildplace
APTCACHEHARDLINK="no"
APTCACHE="/var/cache/pbuilder/aptcache"
PBUILDERROOTCMD="sudo HOME=${HOME}"
BUILDRESULT=$BUILDRESULT
EOF
APTCACHEHARDLINK="no"
APTCACHE="/var/cache/pbuilder/aptcache"
PBUILDERROOTCMD="sudo HOME=${HOME}"
BUILDRESULT=$BUILDRESULT
EOF
+sudo cowbuilder --update --configfile $COWBUILDERCONFIG
+
cd $CHECKOUTPATH/src
PKGNAME=$(dpkg-parsechangelog | awk '/^Source:/ { print $2 }')
PKGVERS=$(dpkg-parsechangelog | awk '/^Version:/ { print $2 }')
cd $CHECKOUTPATH/src
PKGNAME=$(dpkg-parsechangelog | awk '/^Source:/ { print $2 }')
PKGVERS=$(dpkg-parsechangelog | awk '/^Version:/ { print $2 }')
@@
-39,13
+37,13
@@
MAJOR=${PKGVERS%-*}
SMAJOR=${MAJOR#*:}
MINOR=${PKGVERS##*-}
if [ -d $CHECKOUTPATH/.svn ] ; then
SMAJOR=${MAJOR#*:}
MINOR=${PKGVERS##*-}
if [ -d $CHECKOUTPATH/.svn ] ; then
- MINOR=
$MINOR-
svn$(svn info | awk '/^Revision:/ { print $2 }')
+ MINOR=
-$MINOR+
svn$(svn info | awk '/^Revision:/ { print $2 }')
elif [ -d $CHECKOUTPATH/.bzr ] ; then
elif [ -d $CHECKOUTPATH/.bzr ] ; then
- MINOR=
$MINOR-
bzr$(bzr revno)
+ MINOR=
-$MINOR+
bzr$(bzr revno)
elif [ -d $CHECKOUTPATH/.git ] ; then
elif [ -d $CHECKOUTPATH/.git ] ; then
- MINOR=
$MINOR-
git$(git describe --always)
+ MINOR=
-$MINOR+
git$(git describe --always)
else
else
- MINOR=
$MINOR-
$(TZ=UTC date +%Y%m%d%H%M%S)
+ MINOR=
-$MINOR+
$(TZ=UTC date +%Y%m%d%H%M%S)
fi
ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
fi
ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
@@
-53,7
+51,7
@@
dch -b -v $MAJOR$MINOR -D UNRELEASED "This is $DIST-$ARCH autobuild"
perl -pi -e "s/UNRELEASED/$DIST/" debian/changelog
pdebuild --configfile $COWBUILDERCONFIG
perl -pi -e "s/UNRELEASED/$DIST/" debian/changelog
pdebuild --configfile $COWBUILDERCONFIG
-CHANGEFILE=$
(PKGNAME)_$(SMAJOR)$(MINOR)_$(ARCH)
.changes
+CHANGEFILE=$
PKGNAME_$SMAJOR$MINOR_$ARCH
.changes
cd $BUILDRESULT
reprepro -Vb include $DIST $CHANGEFILE
cd $BUILDRESULT
reprepro -Vb include $DIST $CHANGEFILE