[Fusionforge-commits] FusionForge branch master updated. 8e3b7701e722635d2be4d605312adff7f97607d4

Christian Bayle cbayle at fusionforge.org
Thu Nov 22 07:00:52 CET 2012


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  8e3b7701e722635d2be4d605312adff7f97607d4 (commit)
       via  92cc24d53e68acabc8b003e84bcd15d54607d271 (commit)
       via  fb7216bd1656cf3be1b820c107ae6cba3dc373cd (commit)
       via  6e1ff1052ebd60939f911bf134b7f20a92027848 (commit)
      from  f457d37669d239488d7c559b403a2b97f4784ffd (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 8e3b7701e722635d2be4d605312adff7f97607d4
Author: Christian Bayle <chris at bayle.eu>
Date:   Thu Nov 22 06:59:59 2012 +0100

    Install phpunit for selenium from epel

diff --git a/tests/scripts/fusionforge-build-and-test-rpm-cos6.sh b/tests/scripts/fusionforge-build-and-test-rpm-cos6.sh
index 2279112..0623dd4 100755
--- a/tests/scripts/fusionforge-build-and-test-rpm-cos6.sh
+++ b/tests/scripts/fusionforge-build-and-test-rpm-cos6.sh
@@ -33,11 +33,16 @@ gpgcheck = 0
 EOF
 
 setup_dag_repo $@
+setup_epel_repo $@
 
 sleep 5
 ssh root@$HOST "FFORGE_DB=$DB_NAME FFORGE_USER=gforge FFORGE_ADMIN_USER=$FORGE_ADMIN_USERNAME FFORGE_ADMIN_PASSWORD=$FORGE_ADMIN_PASSWORD export FFORGE_DB FFORGE_USER FFORGE_ADMIN_USER FFORGE_ADMIN_PASSWORD; yum install -y --skip-broken fusionforge fusionforge-plugin-scmsvn fusionforge-plugin-svntracker fusionforge-plugin-online_help fusionforge-plugin-extratabs fusionforge-plugin-authldap fusionforge-plugin-scmgit fusionforge-plugin-blocks"
 
 ssh root@$HOST '(echo [core];echo use_ssl=no) > /etc/gforge/config.ini.d/zzz-buildbot.ini'
+# Better to remove this until ssl conf is fixed properly
+# I noticed that on centos6 gforge.conf should be included after ssl.conf
+# We should consider having separate files for ssl and maybe separate ff package
+ssh root@$HOST "yum -y remove mod_ssl ; service httpd restart"
 ssh root@$HOST "(echo [moinmoin];echo use_frame=no) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"
 ssh root@$HOST "(echo [mediawiki];echo unbreak_frames=yes) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"
 ssh root@$HOST "su - postgres -c \"pg_dumpall\" > /root/dump"
@@ -47,6 +52,9 @@ ssh root@$HOST "perl -spi -e s#/usr/sbin/sendmail#$FORGE_HOME/tests/scripts/catc
 echo "Stop cron daemon"
 ssh root@$HOST "service crond stop" || true
 
+# Install phpunit
+ssh root@$HOST "yum -y --enablerepo=epel install php-phpunit-PHPUnit-Selenium"
+
 # Install selenium
 ssh root@$HOST "yum -y install selenium"
 
diff --git a/tests/scripts/fusionforge-build-and-test-src-cos6.sh b/tests/scripts/fusionforge-build-and-test-src-cos6.sh
index 57ce2d0..7882992 100755
--- a/tests/scripts/fusionforge-build-and-test-src-cos6.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-cos6.sh
@@ -19,6 +19,7 @@ setup_redhat_3rdparty_repo
 #make -f Makefile.rh BUILDRESULT=$WORKSPACE/build/packages src
 
 setup_dag_repo $@
+setup_epel_repo $@
 
 echo "Create $FORGE_HOME if necessary"
 ssh root@$HOST "[ -d $FORGE_HOME ] || mkdir -p $FORGE_HOME"
@@ -47,6 +48,9 @@ ssh root@$HOST "(echo [mediawiki];echo unbreak_frames=yes) >> /etc/gforge/config
 echo "Stop cron daemon"
 ssh root@$HOST "service crond stop" || true
 
+# Install phpunit
+ssh root@$HOST "yum -y --enablerepo=epel install php-phpunit-PHPUnit-Selenium"
+
 # Install selenium
 ssh root@$HOST "yum -y install selenium"
 

commit 92cc24d53e68acabc8b003e84bcd15d54607d271
Author: Christian Bayle <chris at bayle.eu>
Date:   Thu Nov 22 06:58:50 2012 +0100

    Add setup_epel_repo, embed dag config in the script

diff --git a/tests/scripts/common-functions b/tests/scripts/common-functions
index 764a103..8cfa7ec 100644
--- a/tests/scripts/common-functions
+++ b/tests/scripts/common-functions
@@ -42,18 +42,87 @@ prepare_workspace()
 	mkdir -p $WORKSPACE/apidocs
 }
 
+setup_epel_repo()
+{
+if [ -z "$HOST" ] ; then  echo "HOST undefined" ;exit 1; fi
+HOST=$1
+# EPEL REPO
+if [ ! -z "$EPEL_REPO" ] ; then
+        echo "Installing specific EPEL REPO $EPEL_REPO"
+	ssh root@$HOST "cat > /etc/yum.repos.d/epel.repo" <<-EOF
+# Name: EPEL RPM Repository for Red Hat Enterprise \$releasever - epel
+# URL: http://fedoraproject.org/wiki/EPEL
+[epel]
+name=Extra Packages for Enterprise Linux \$releasever - \$basearch 
+baseurl=$EPEL_REPO/\$releasever/\$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel\$releasever&arch=\$basearch
+failovermethod=priority
+enabled=0
+gpgcheck=0
+EOF
+else
+        echo "Installing standard EPEL REPO"
+	ssh root@$HOST "cat > /etc/yum.repos.d/epel.repo" <<-EOF
+# Name: EPEL RPM Repository for Red Hat Enterprise \$releasever - epel
+# URL: http://fedoraproject.org/wiki/EPEL
+[epel]
+name=Extra Packages for Enterprise Linux \$releasever - \$basearch 
+#baseurl=http://download.fedoraproject.org/pub/epel/\$releasever/\$basearch
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel\$releasever&arch=\$basearch
+failovermethod=priority
+enabled=0
+gpgcheck=0
+EOF
+fi
+}
+
 setup_dag_repo()
 {
 HOST=$1
+if [ -z "$HOST" ] ; then  echo "HOST undefined" ;exit 1; fi
 # DAG REPO
 if [ ! -z "$DAG_RPMFORGE_REPO" ] ; then
         echo "Installing specific DAG REPO $DAG_RPMFORGE_REPO"
-        cp src/rpm-specific/dag-rpmforge.repo $WORKSPACE/build/packages/dag-rpmforge.repo
-        sed -i "s#http://apt.sw.be/redhat#${DAG_RPMFORGE_REPO}#" $WORKSPACE/build/packages/dag-rpmforge.repo
-        scp $WORKSPACE/build/packages/dag-rpmforge.repo root@$HOST:/etc/yum.repos.d/
+	ssh root@$HOST "cat > /etc/yum.repos.d/dag-rpmforge.repo" <<-EOF
+# Name: RPMforge RPM Repository for Red Hat Enterprise \$releasever - dag
+# URL: http://rpmforge.net/
+[dag-rpmforge]
+name = Red Hat Enterprise \$releasever - RPMforge.net - dag
+baseurl = $DAG_RPMFORGE_REPO/el\$releasever/en/\$basearch/dag
+#mirrorlist = http://apt.sw.be/redhat/el\$releasever/en/mirrors-rpmforge
+enabled = 1
+protect = 0
+gpgcheck = 0
+
+[dag-rpmforge-extra]
+name = Red Hat Enterprise \$releasever - RPMforge.net - extra
+baseurl = $DAG_RPMFORGE_REPO/el\$releasever/en/\$basearch/extras
+#mirrorlist = http://apt.sw.be/redhat/el\$releasever/en/mirrors-rpmforge
+enabled = 0
+protect = 0
+gpgcheck = 0
+EOF
 else
-        echo "Installing standard DAG REPO from src/rpm-specific/dag-rpmforge.repo"
-        scp src/rpm-specific/dag-rpmforge.repo root@$HOST:/etc/yum.repos.d/
+        echo "Installing standard DAG REPO"
+	ssh root@$HOST "cat > /etc/yum.repos.d/dag-rpmforge.repo" <<-EOF
+# Name: RPMforge RPM Repository for Red Hat Enterprise \$releasever - dag
+# URL: http://rpmforge.net/
+[dag-rpmforge]
+name = Red Hat Enterprise \$releasever - RPMforge.net - dag
+#baseurl = http://apt.sw.be/redhat/el\$releasever/en/\$basearch/dag
+mirrorlist = http://apt.sw.be/redhat/el\$releasever/en/mirrors-rpmforge
+enabled = 1
+protect = 0
+gpgcheck = 0
+
+[dag-rpmforge-extra]
+name = Red Hat Enterprise \$releasever - RPMforge.net - extra
+#baseurl = http://apt.sw.be/redhat/el\$releasever/en/\$basearch/extras
+mirrorlist = http://apt.sw.be/redhat/el\$releasever/en/mirrors-rpmforge
+enabled = 0
+protect = 0
+gpgcheck = 0
+EOF
 fi
 }
 

commit fb7216bd1656cf3be1b820c107ae6cba3dc373cd
Author: Christian Bayle <chris at bayle.eu>
Date:   Thu Nov 22 06:57:30 2012 +0100

    Add default EPEL repo (mirrorlist seems to fail)

diff --git a/tests/config/default b/tests/config/default
index ca45296..9021882 100644
--- a/tests/config/default
+++ b/tests/config/default
@@ -29,7 +29,7 @@ DEBMIRRORSEC=http://security.debian.org/
 # Redhat mirrors
 #CENTOSMIRROR=http://mirror.bytemark.co.uk/centos/
 #DAG_RPMFORGE_REPO=http://apt.sw.be/redhat
-#EPEL_REPO=http://download.fedoraproject.org/pub/epel
+EPEL_REPO=http://download.fedoraproject.org/pub/epel
 
 # Debian 3rd-party
 DEB3RD=http://buildbot3.fusionforge.org/job/3rd-party-deb/ws/build/debian/

commit 6e1ff1052ebd60939f911bf134b7f20a92027848
Author: Christian Bayle <chris at bayle.eu>
Date:   Thu Nov 22 06:56:16 2012 +0100

    Make independant of redhat release version

diff --git a/src/rpm-specific/epel-short.repo b/src/rpm-specific/epel-short.repo
index 4ec021b..4273e8b 100644
--- a/src/rpm-specific/epel-short.repo
+++ b/src/rpm-specific/epel-short.repo
@@ -1,7 +1,9 @@
+# Name: EPEL RPM Repository for Red Hat Enterprise $releasever - epel
+# URL: http://fedoraproject.org/wiki/EPEL
 [epel]
-name=Extra Packages for Enterprise Linux 5 - $basearch 
-baseurl=http://download.fedoraproject.org/pub/epel/5/$basearch
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel5&arch=$basearch
+name=Extra Packages for Enterprise Linux $releasever - $basearch 
+baseurl=http://download.fedoraproject.org/pub/epel/$releasever/$basearch
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel$releasever&arch=$basearch
 failovermethod=priority
 enabled=0
 gpgcheck=0

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

Summary of changes:
 src/rpm-specific/epel-short.repo                   |    8 +-
 tests/config/default                               |    2 +-
 tests/scripts/common-functions                     |   79 ++++++++++++++++++--
 .../scripts/fusionforge-build-and-test-rpm-cos6.sh |    8 ++
 .../scripts/fusionforge-build-and-test-src-cos6.sh |    4 +
 5 files changed, 92 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list