[Fusionforge-commits] FusionForge branch 6.0 updated. v5.3-rc4-2982-g3e5223d

Roland Mas lolando at libremir.placard.fr.eu.org
Fri May 29 17:37:43 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  3e5223dd4cc69cc556a10ce9937d826f5ee69b91 (commit)
       via  df612ce2c112c54c6b99f4e9ee7ac7bb397d316e (commit)
      from  7675546c6152cde58f576e08c4494a4d2d2ef395 (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 3e5223dd4cc69cc556a10ce9937d826f5ee69b91
Author: Roland Mas <lolando at debian.org>
Date:   Fri May 29 17:27:03 2015 +0200

    Ignore generated tarballs

diff --git a/.gitignore b/.gitignore
index 0ab4f75..aa82379 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,9 @@ src/www/scm/viewvc/viewvc.org/*.zip
 /.pc
 src/.pc
 fusionforge*.orig.tar.bz2
+fusionforge-*.tar.bz2
+src/fusionforge-*.tar.bz2
+# Debian packaging
 src/debian/control
 # RPM packaging:
 build/

commit df612ce2c112c54c6b99f4e9ee7ac7bb397d316e
Author: Roland Mas <lolando at debian.org>
Date:   Fri May 29 17:22:52 2015 +0200

    Fetch built packages into the "workspace" after the tests have run

diff --git a/tests/buildbot/fusionforge-build-and-test.sh b/tests/buildbot/fusionforge-build-and-test.sh
index 0ed402a..afe2f40 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -98,5 +98,14 @@ ssh root@$HOST "/usr/src/fusionforge/autoinstall/vnc-run-testsuite.sh /usr/src/f
 
 copy_logs
 
+case $INSTALL_METHOD in
+    deb)
+	rsync -av root@$HOST:/usr/src/debian-repository/local $WORKSPACE/repository
+	;;
+    rpm)
+	rsync -av root@$HOST:/usr/src/fusionforge/build/RPMS $WORKSPACE/repository
+	;;
+esac
+
 stop_vm_if_not_kept $HOST
 exit $retcode

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

Summary of changes:
 .gitignore                                   | 3 +++
 tests/buildbot/fusionforge-build-and-test.sh | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/.gitignore b/.gitignore
index 0ab4f75..aa82379 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,9 @@ src/www/scm/viewvc/viewvc.org/*.zip
 /.pc
 src/.pc
 fusionforge*.orig.tar.bz2
+fusionforge-*.tar.bz2
+src/fusionforge-*.tar.bz2
+# Debian packaging
 src/debian/control
 # RPM packaging:
 build/
diff --git a/tests/buildbot/fusionforge-build-and-test.sh b/tests/buildbot/fusionforge-build-and-test.sh
index 0ed402a..afe2f40 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -98,5 +98,14 @@ ssh root@$HOST "/usr/src/fusionforge/autoinstall/vnc-run-testsuite.sh /usr/src/f
 
 copy_logs
 
+case $INSTALL_METHOD in
+    deb)
+	rsync -av root@$HOST:/usr/src/debian-repository/local $WORKSPACE/repository
+	;;
+    rpm)
+	rsync -av root@$HOST:/usr/src/fusionforge/build/RPMS $WORKSPACE/repository
+	;;
+esac
+
 stop_vm_if_not_kept $HOST
 exit $retcode


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list