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 ae110f532e31c22e94b1758d6f0b4747782ba634 (commit)
from 31cbb5c9e86dd396df940f8ffab87359804b2dd5 (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 ae110f532e31c22e94b1758d6f0b4747782ba634
Author: Roland Mas <[email protected]>
Date: Mon Jun 1 12:41:48 2015 +0200
Split pushing of packages into its own file
diff --git a/tests/buildbot/fusionforge-build-and-test.sh
b/tests/buildbot/fusionforge-build-and-test.sh
index 7df8de7..370450e 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -98,18 +98,14 @@ ssh root@$HOST
"/usr/src/fusionforge/autoinstall/vnc-run-testsuite.sh /usr/src/f
copy_logs
-if [ $retcode = 0 && "$PUBLISH_REPO" = 1 ] ; then
- branch=$(echo $GIT_BRANCH | sed -e s,origin/,, -e s,/,_,g)
+if [ $retcode = 0 ] ; then
case $INSTALL_METHOD in
deb)
cd $WORKSPACE/packages/
rsync -av --delete root@$HOST:/usr/src/debian-repository/local/ ./
- 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/
- rsync -av --delete $WORKSPACE/packages/
[email protected]:/home/groups/fusionforge/htdocs/rpm/$VM-$branch/
;;
esac
fi
diff --git a/tests/buildbot/push-packages-to-repositories.sh
b/tests/buildbot/push-packages-to-repositories.sh
new file mode 100644
index 0000000..ecd63d5
--- /dev/null
+++ b/tests/buildbot/push-packages-to-repositories.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -e
+
+os=$1
+method=$2
+branch=$(echo $GIT_BRANCH | sed -e s,origin/,, -e s,/,_,g)
+
+case $os in
+ debian7)
+ dist=wheezy
+ ;;
+ debian8)
+ dist=jessie
+ ;;
+ centos*)
+ dist=$os
+ ;;
+ *)
+ echo "Unknown OS"
+ exit 1
+ ;;
+esac
+
+case $method in
+ src)
+ echo "No packages to handle"
+ exit 0
+ ;;
+ deb)
+ cd $WORKSPACE/packages/
+ sed -i -e "s/^Distribution:.*/Distribution: $dist-$branch/"
fusionforge*changes
+ dput fforg fusionforge*changes
+ ;;
+ rpm)
+ rsync -av --delete $WORKSPACE/packages/
[email protected]:/home/groups/fusionforge/htdocs/rpm/$dist-$branch/
+ ;;
+ *)
+ echo "Unknown install method"
+ exit 1
+ ;;
+esac
-----------------------------------------------------------------------
Summary of changes:
tests/buildbot/fusionforge-build-and-test.sh | 6 +---
tests/buildbot/push-packages-to-repositories.sh | 42 +++++++++++++++++++++++++
2 files changed, 43 insertions(+), 5 deletions(-)
create mode 100644 tests/buildbot/push-packages-to-repositories.sh
diff --git a/tests/buildbot/fusionforge-build-and-test.sh
b/tests/buildbot/fusionforge-build-and-test.sh
index 7df8de7..370450e 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -98,18 +98,14 @@ ssh root@$HOST
"/usr/src/fusionforge/autoinstall/vnc-run-testsuite.sh /usr/src/f
copy_logs
-if [ $retcode = 0 && "$PUBLISH_REPO" = 1 ] ; then
- branch=$(echo $GIT_BRANCH | sed -e s,origin/,, -e s,/,_,g)
+if [ $retcode = 0 ] ; then
case $INSTALL_METHOD in
deb)
cd $WORKSPACE/packages/
rsync -av --delete root@$HOST:/usr/src/debian-repository/local/ ./
- 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/
- rsync -av --delete $WORKSPACE/packages/
[email protected]:/home/groups/fusionforge/htdocs/rpm/$VM-$branch/
;;
esac
fi
diff --git a/tests/buildbot/push-packages-to-repositories.sh
b/tests/buildbot/push-packages-to-repositories.sh
new file mode 100644
index 0000000..ecd63d5
--- /dev/null
+++ b/tests/buildbot/push-packages-to-repositories.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -e
+
+os=$1
+method=$2
+branch=$(echo $GIT_BRANCH | sed -e s,origin/,, -e s,/,_,g)
+
+case $os in
+ debian7)
+ dist=wheezy
+ ;;
+ debian8)
+ dist=jessie
+ ;;
+ centos*)
+ dist=$os
+ ;;
+ *)
+ echo "Unknown OS"
+ exit 1
+ ;;
+esac
+
+case $method in
+ src)
+ echo "No packages to handle"
+ exit 0
+ ;;
+ deb)
+ cd $WORKSPACE/packages/
+ sed -i -e "s/^Distribution:.*/Distribution: $dist-$branch/"
fusionforge*changes
+ dput fforg fusionforge*changes
+ ;;
+ rpm)
+ rsync -av --delete $WORKSPACE/packages/
[email protected]:/home/groups/fusionforge/htdocs/rpm/$dist-$branch/
+ ;;
+ *)
+ echo "Unknown install method"
+ exit 1
+ ;;
+esac
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
