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 a67964142eb3c5af2453351e0fdb4c411fffad20 (commit)
from 3e5223dd4cc69cc556a10ce9937d826f5ee69b91 (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 a67964142eb3c5af2453351e0fdb4c411fffad20
Author: Roland Mas <[email protected]>
Date: Fri May 29 23:27:23 2015 +0200
Store packages repositories in the workspace after a successful build
diff --git a/tests/buildbot/common-functions b/tests/buildbot/common-functions
index e4d91e6..c9ea983 100644
--- a/tests/buildbot/common-functions
+++ b/tests/buildbot/common-functions
@@ -24,16 +24,8 @@ prepare_workspace()
export BUILDRESULT=$WORKSPACE/build/packages
mkdir -p $BUILDRESULT
export BUILDERDIR=${BUILDERDIR:-$HOME/builder}
- # Delete existing packages
- if [ -d $WORKSPACE/build/packages ]
- then
- rm -fr $WORKSPACE/build/packages/*
- fi
- # Create place to build package if necessary
- [ ! -d $WORKSPACE/build/packages ] || mkdir -p $WORKSPACE/build/packages
- # Erase config
- [ ! -d $WORKSPACE/build/config ] || rm -fr $WORKSPACE/build/config
- mkdir -p $WORKSPACE/build/config
+ # Create place to store built packages
+ [ ! -d $WORKSPACE/packages ] || mkdir -p $WORKSPACE/packages
# Erase reports
[ ! -d $WORKSPACE/reports ] || rm -fr $WORKSPACE/reports
mkdir -p $WORKSPACE/reports/coverage
diff --git a/tests/buildbot/fusionforge-build-and-test.sh
b/tests/buildbot/fusionforge-build-and-test.sh
index afe2f40..6961257 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -100,10 +100,10 @@ copy_logs
case $INSTALL_METHOD in
deb)
- rsync -av root@$HOST:/usr/src/debian-repository/local
$WORKSPACE/repository
+ rsync -av --delete root@$HOST:/usr/src/debian-repository/local/
$WORKSPACE/packages/
;;
rpm)
- rsync -av root@$HOST:/usr/src/fusionforge/build/RPMS
$WORKSPACE/repository
+ rsync -av --delete root@$HOST:/usr/src/fusionforge/build/RPMS/
$WORKSPACE/packages/
;;
esac
-----------------------------------------------------------------------
Summary of changes:
tests/buildbot/common-functions | 12 ++----------
tests/buildbot/fusionforge-build-and-test.sh | 4 ++--
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/tests/buildbot/common-functions b/tests/buildbot/common-functions
index e4d91e6..c9ea983 100644
--- a/tests/buildbot/common-functions
+++ b/tests/buildbot/common-functions
@@ -24,16 +24,8 @@ prepare_workspace()
export BUILDRESULT=$WORKSPACE/build/packages
mkdir -p $BUILDRESULT
export BUILDERDIR=${BUILDERDIR:-$HOME/builder}
- # Delete existing packages
- if [ -d $WORKSPACE/build/packages ]
- then
- rm -fr $WORKSPACE/build/packages/*
- fi
- # Create place to build package if necessary
- [ ! -d $WORKSPACE/build/packages ] || mkdir -p $WORKSPACE/build/packages
- # Erase config
- [ ! -d $WORKSPACE/build/config ] || rm -fr $WORKSPACE/build/config
- mkdir -p $WORKSPACE/build/config
+ # Create place to store built packages
+ [ ! -d $WORKSPACE/packages ] || mkdir -p $WORKSPACE/packages
# Erase reports
[ ! -d $WORKSPACE/reports ] || rm -fr $WORKSPACE/reports
mkdir -p $WORKSPACE/reports/coverage
diff --git a/tests/buildbot/fusionforge-build-and-test.sh
b/tests/buildbot/fusionforge-build-and-test.sh
index afe2f40..6961257 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -100,10 +100,10 @@ copy_logs
case $INSTALL_METHOD in
deb)
- rsync -av root@$HOST:/usr/src/debian-repository/local
$WORKSPACE/repository
+ rsync -av --delete root@$HOST:/usr/src/debian-repository/local/
$WORKSPACE/packages/
;;
rpm)
- rsync -av root@$HOST:/usr/src/fusionforge/build/RPMS
$WORKSPACE/repository
+ rsync -av --delete root@$HOST:/usr/src/fusionforge/build/RPMS/
$WORKSPACE/packages/
;;
esac
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
