This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.0 has been updated
via e36a4c7fb12bd42e743720165d89b8ab05c6b5e4 (commit)
from cb34f2f14a67b40644a81cb8ddb4c541c6004cc4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e36a4c7fb12bd42e743720165d89b8ab05c6b5e4
Author: Roland Mas <[email protected]>
Date: Mon Jun 1 11:14:40 2015 +0200
Push generated *.deb packages to a repository on fusionforge.fusionforge.org
diff --git a/tests/buildbot/fusionforge-build-and-test.sh
b/tests/buildbot/fusionforge-build-and-test.sh
index 80dc556..3aa8222 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -99,9 +99,12 @@ ssh root@$HOST
"/usr/src/fusionforge/autoinstall/vnc-run-testsuite.sh /usr/src/f
copy_logs
if [ $retcode = 0 ] ; then
+ branch=$(git branch | awk '/^\*/ { print $2 }' | sed s,/,_,g)
case $INSTALL_METHOD in
deb)
rsync -av --delete root@$HOST:/usr/src/debian-repository/local/
$WORKSPACE/packages/
+ sed -i -e "s/^Distribution:.*/Distribution: $DIST-$branch/"
fusionforge*changes
+ dput fforg fusionforge*changes
;;
rpm)
rsync -av --delete root@$HOST:/usr/src/fusionforge/build/RPMS/
$WORKSPACE/packages/
-----------------------------------------------------------------------
Summary of changes:
tests/buildbot/fusionforge-build-and-test.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/buildbot/fusionforge-build-and-test.sh
b/tests/buildbot/fusionforge-build-and-test.sh
index 80dc556..3aa8222 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -99,9 +99,12 @@ ssh root@$HOST
"/usr/src/fusionforge/autoinstall/vnc-run-testsuite.sh /usr/src/f
copy_logs
if [ $retcode = 0 ] ; then
+ branch=$(git branch | awk '/^\*/ { print $2 }' | sed s,/,_,g)
case $INSTALL_METHOD in
deb)
rsync -av --delete root@$HOST:/usr/src/debian-repository/local/
$WORKSPACE/packages/
+ sed -i -e "s/^Distribution:.*/Distribution: $DIST-$branch/"
fusionforge*changes
+ dput fforg fusionforge*changes
;;
rpm)
rsync -av --delete root@$HOST:/usr/src/fusionforge/build/RPMS/
$WORKSPACE/packages/
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
