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 6ee6928fdd7721ecc086aae477eb6a8a2a4f654c (commit)
from e36a4c7fb12bd42e743720165d89b8ab05c6b5e4 (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 6ee6928fdd7721ecc086aae477eb6a8a2a4f654c
Author: Roland Mas <[email protected]>
Date: Mon Jun 1 11:27:50 2015 +0200
Push generated *.rpm 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 3aa8222..3b628d2 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -99,7 +99,7 @@ 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)
+ branch=$(echo $GIT_BRANCH | sed -e s,origin/,, -e s,/,_,g)
case $INSTALL_METHOD in
deb)
rsync -av --delete root@$HOST:/usr/src/debian-repository/local/
$WORKSPACE/packages/
@@ -108,6 +108,7 @@ if [ $retcode = 0 ] ; then
;;
rpm)
rsync -av --delete root@$HOST:/usr/src/fusionforge/build/RPMS/
$WORKSPACE/packages/
+ rsync -av --delete $WORKSPACE/packages/
[email protected]:/home/groups/fusionforge/htdocs/rpm/$VM-$branch/
;;
esac
fi
-----------------------------------------------------------------------
Summary of changes:
tests/buildbot/fusionforge-build-and-test.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/buildbot/fusionforge-build-and-test.sh
b/tests/buildbot/fusionforge-build-and-test.sh
index 3aa8222..3b628d2 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -99,7 +99,7 @@ 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)
+ branch=$(echo $GIT_BRANCH | sed -e s,origin/,, -e s,/,_,g)
case $INSTALL_METHOD in
deb)
rsync -av --delete root@$HOST:/usr/src/debian-repository/local/
$WORKSPACE/packages/
@@ -108,6 +108,7 @@ if [ $retcode = 0 ] ; then
;;
rpm)
rsync -av --delete root@$HOST:/usr/src/fusionforge/build/RPMS/
$WORKSPACE/packages/
+ rsync -av --delete $WORKSPACE/packages/
[email protected]:/home/groups/fusionforge/htdocs/rpm/$VM-$branch/
;;
esac
fi
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
