[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.2-66-g743f014

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Mon Sep 7 12:22:32 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  743f0142ec53fd122587481cab1e1adad6ded7ea (commit)
       via  6ba67bfb39595d4f171a60e7430e0fd86ba83b0f (commit)
       via  c3069760ff5332865c1becd9ef1b3cb972f9f81f (commit)
      from  b1835ac7a1aee48f000b864a6bd2333890f5cba9 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=743f0142ec53fd122587481cab1e1adad6ded7ea

commit 743f0142ec53fd122587481cab1e1adad6ded7ea
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Sep 7 12:22:19 2015 +0200

    testsuite: more clean-ups

diff --git a/tests/buildbot/common-functions b/tests/buildbot/common-functions
index c28dae6..d52cbb0 100644
--- a/tests/buildbot/common-functions
+++ b/tests/buildbot/common-functions
@@ -17,16 +17,9 @@ prepare_workspace() {
     export CURDIR=`pwd`
     WORKDIR=$(cd $CURDIR/..; pwd)
     export WORKSPACE=${WORKSPACE:-$WORKDIR}
-    export RPM_TMP=$WORKDIR/tmp
-    export BUILDRESULT=$WORKSPACE/build/packages
-    mkdir -p $BUILDRESULT
-    export BUILDERDIR=${BUILDERDIR:-$HOME/builder}
     # 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
-    # Erase apidocs
-    [ ! -d $WORKSPACE/apidocs ] || rm -fr $WORKSPACE/apidocs
-    mkdir -p $WORKSPACE/apidocs
 }
diff --git a/tests/buildbot/fusionforge-unit_tests.sh b/tests/buildbot/fusionforge-unit_tests.sh
index 3ae0559..0085487 100755
--- a/tests/buildbot/fusionforge-unit_tests.sh
+++ b/tests/buildbot/fusionforge-unit_tests.sh
@@ -8,7 +8,7 @@ get_config
 prepare_workspace
 
 # apt-get install pcregrep moreutils xalan
-cd tests
+cd tests/
 phpunit --log-junit $WORKSPACE/reports/phpunit.xml \
 	--coverage-clover $WORKSPACE/reports/coverage/clover.xml \
 	--coverage-html $WORKSPACE/reports/coverage/ \

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=6ba67bfb39595d4f171a60e7430e0fd86ba83b0f

commit 6ba67bfb39595d4f171a60e7430e0fd86ba83b0f
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Sep 7 11:59:35 2015 +0200

    testsuite: rename build-and-test -> func_tests for clarity

diff --git a/tests/buildbot/fusionforge-build-and-test.sh b/tests/buildbot/fusionforge-func_tests.sh
similarity index 100%
rename from tests/buildbot/fusionforge-build-and-test.sh
rename to tests/buildbot/fusionforge-func_tests.sh
diff --git a/tests/buildbot/fusionforge-unittests.sh b/tests/buildbot/fusionforge-unit_tests.sh
similarity index 100%
rename from tests/buildbot/fusionforge-unittests.sh
rename to tests/buildbot/fusionforge-unit_tests.sh

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c3069760ff5332865c1becd9ef1b3cb972f9f81f

commit c3069760ff5332865c1becd9ef1b3cb972f9f81f
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Mon Sep 7 11:45:28 2015 +0200

    install: epel-release is installable by default in CentOS

diff --git a/autoinstall/common-backports b/autoinstall/common-backports
index ffc366d..2fe2c26 100644
--- a/autoinstall/common-backports
+++ b/autoinstall/common-backports
@@ -129,15 +129,8 @@ function backports_rpm {
     os_version=$(rpm -q --qf "%{VERSION}" $(rpm -q --whatprovides redhat-release))
 
     if ! rpm -q fedora-release >/dev/null; then
-	# EPEL - http://download.fedoraproject.org/pub/epel/6/i386/repoview/epel-release.html
-	#      - http://download.fedoraproject.org/pub/epel/7/x86_64/repoview/epel-release.html
-	if ! rpm -q epel-release >/dev/null; then
-	    case $os_version in
-		7)
-		    rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-		    ;;
-	    esac
-	fi
+	# Enable EPEL
+	yum install -y epel-release
 
 	# Prepare manual backports
 	cat <<'EOF' > /etc/yum.repos.d/fedora-source.repo
diff --git a/tests/buildbot/fusionforge-build-and-test.sh b/tests/buildbot/fusionforge-build-and-test.sh
index f5b2146..99443d4 100755
--- a/tests/buildbot/fusionforge-build-and-test.sh
+++ b/tests/buildbot/fusionforge-build-and-test.sh
@@ -69,8 +69,7 @@ gpgcheck=0
 EOF
     else
         echo "Installing standard EPEL REPO"
-	ssh root@$HOST rpm -ivh \
-	    https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm || true
+	ssh root@$HOST yum install -y epel-release
     fi
 }
 

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

Summary of changes:
 autoinstall/common-backports                                  | 11 ++---------
 tests/buildbot/common-functions                               |  7 -------
 ...usionforge-build-and-test.sh => fusionforge-func_tests.sh} |  3 +--
 .../{fusionforge-unittests.sh => fusionforge-unit_tests.sh}   |  2 +-
 4 files changed, 4 insertions(+), 19 deletions(-)
 rename tests/buildbot/{fusionforge-build-and-test.sh => fusionforge-func_tests.sh} (97%)
 rename tests/buildbot/{fusionforge-unittests.sh => fusionforge-unit_tests.sh} (98%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list