[Fusionforge-commits] FusionForge branch master updated. v5.3-rc4-3069-g708a47c

Roland Mas lolando at libremir.placard.fr.eu.org
Mon Jun 1 15:45:36 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, master has been updated
       via  708a47cd8df42d76bbbd235c148cc6c818c5df81 (commit)
       via  3253817f2fc66db7b02b2120e8891a4cf2a25fec (commit)
       via  40cde68c23fa03fa6149abe8efa543b6004312b3 (commit)
       via  4eb2986b921967672c97db7a132fb2f1584721b7 (commit)
       via  63c77fb2f8c514902dbeefb9cadd5ef6106c2da0 (commit)
       via  3fc56a446f10dc70626bad73aed6030a09326a64 (commit)
       via  c21cd804308a12deb6922c43e043f609869f6eda (commit)
      from  4eb2fa496497f445ee84e13b6b6876af43c3c555 (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 708a47cd8df42d76bbbd235c148cc6c818c5df81
Merge: 40cde68 3253817
Author: Roland Mas <lolando at debian.org>
Date:   Mon Jun 1 15:43:21 2015 +0200

    Merge branch '6.0'


commit 40cde68c23fa03fa6149abe8efa543b6004312b3
Merge: 4eb2fa4 4eb2986
Author: Roland Mas <lolando at debian.org>
Date:   Mon Jun 1 15:19:19 2015 +0200

    Merge branch '6.0'


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

Summary of changes:
 tests/buildbot/fusionforge-build-and-test.sh    |  5 +----
 tests/buildbot/push-packages-to-repositories.sh | 10 ++++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 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 b30abdd..80dc556 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -101,10 +101,7 @@ copy_logs
 if [ $retcode = 0 ] ; then
     case $INSTALL_METHOD in
 	deb)
-	    cwd=$(pwd)
-	    cd $WORKSPACE/packages/
-	    rsync -av --delete root@$HOST:/usr/src/debian-repository/local/ ./
-	    cd $cwd
+	    rsync -av --delete root@$HOST:/usr/src/debian-repository/local/ $WORKSPACE/packages/
 	    ;;
 	rpm)
 	    rsync -av --delete root@$HOST:/usr/src/fusionforge/build/RPMS/ $WORKSPACE/packages/
diff --git a/tests/buildbot/push-packages-to-repositories.sh b/tests/buildbot/push-packages-to-repositories.sh
old mode 100644
new mode 100755
index ecd63d5..f0f68c9
--- a/tests/buildbot/push-packages-to-repositories.sh
+++ b/tests/buildbot/push-packages-to-repositories.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 os=$1
 method=$2
-branch=$(echo $GIT_BRANCH | sed -e s,origin/,, -e s,/,_,g)
+branch=$(echo $GIT_BRANCH | sed -e s,origin/,, -e s,remotes_,, -e s,remotes/,, -e s,/,_,g)
 
 case $os in
     debian7)
@@ -13,6 +13,12 @@ case $os in
     debian8)
 	dist=jessie
 	;;
+    debian9)
+	dist=stretch
+	;;
+    debian10)
+	dist=buster
+	;;
     centos*)
 	dist=$os
 	;;


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list