[Fusionforge-commits] FusionForge branch 6.0 updated. v5.3-rc4-2993-g76f60cd

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Mon Jun 1 12:06:38 CEST 2015


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  76f60cdc06dd1a7defdaa8faec51170c69293d00 (commit)
       via  447fc0f16fefec8d8b91041a1cb6c3143ec2f9d8 (commit)
      from  6ee6928fdd7721ecc086aae477eb6a8a2a4f654c (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 76f60cdc06dd1a7defdaa8faec51170c69293d00
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Jun 1 12:05:52 2015 +0200

    testsuite: make repo publication optional

diff --git a/tests/buildbot/fusionforge-build-and-test.sh b/tests/buildbot/fusionforge-build-and-test.sh
index 168cd87..e390dba 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -98,7 +98,7 @@ ssh root@$HOST "/usr/src/fusionforge/autoinstall/vnc-run-testsuite.sh /usr/src/f
 
 copy_logs
 
-if [ $retcode = 0 ] ; then
+if [ $retcode = 0 && "$PUBLISH_REPO" = 1 ] ; then
     branch=$(echo $GIT_BRANCH | sed -e s,origin/,, -e s,/,_,g)
     case $INSTALL_METHOD in
 	deb)

commit 447fc0f16fefec8d8b91041a1cb6c3143ec2f9d8
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Jun 1 12:05:40 2015 +0200

    testsuite: fix .changes path

diff --git a/tests/buildbot/fusionforge-build-and-test.sh b/tests/buildbot/fusionforge-build-and-test.sh
index 3b628d2..168cd87 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -103,7 +103,7 @@ if [ $retcode = 0 ] ; then
     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
+	    sed -i -e "s/^Distribution:.*/Distribution: $DIST-$branch/" $WORKSPACE/packages/fusionforge*changes
 	    dput fforg fusionforge*changes
 	    ;;
 	rpm)

-----------------------------------------------------------------------

Summary of changes:
 tests/buildbot/fusionforge-build-and-test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/buildbot/fusionforge-build-and-test.sh b/tests/buildbot/fusionforge-build-and-test.sh
index 3b628d2..e390dba 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -98,12 +98,12 @@ ssh root@$HOST "/usr/src/fusionforge/autoinstall/vnc-run-testsuite.sh /usr/src/f
 
 copy_logs
 
-if [ $retcode = 0 ] ; then
+if [ $retcode = 0 && "$PUBLISH_REPO" = 1 ] ; then
     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/
-	    sed -i -e "s/^Distribution:.*/Distribution: $DIST-$branch/" fusionforge*changes
+	    sed -i -e "s/^Distribution:.*/Distribution: $DIST-$branch/" $WORKSPACE/packages/fusionforge*changes
 	    dput fforg fusionforge*changes
 	    ;;
 	rpm)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list