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 29cc430f9c4af115b89c6ca71a8784ce8981fe73 (commit)
via c6c4df80ce85f7bf53d3f789907e83945f4da360 (commit)
from a44c69a820c433a0e17506f807a6a269d244f6b4 (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=29cc430f9c4af115b89c6ca71a8784ce8981fe73
commit 29cc430f9c4af115b89c6ca71a8784ce8981fe73
Author: Franck Villaume <[email protected]>
Date: Mon Aug 14 14:09:22 2017 +0200
workaround for centos test suite: downgrade httpd-itk to 2.4.7.04-1
diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index 0a9d27a..b9fd693 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -24,13 +24,13 @@ set -ex
export DEBIAN_FRONTEND=noninteractive
if [ -z "$1" ]; then
- set +x
- echo "Usage:"
- echo " $0 src/debian"
- echo " $0 deb/debian"
- echo " $0 src/centos"
- echo " $0 rpm/centos"
- exit 1
+ set +x
+ echo "Usage:"
+ echo " $0 src/debian"
+ echo " $0 deb/debian"
+ echo " $0 src/centos"
+ echo " $0 rpm/centos"
+ exit 1
fi
export INSTALL_METHOD=${1%/*}
@@ -38,61 +38,73 @@ export INSTALL_OS=${1#*/}
shift
case $INSTALL_METHOD in
- rpm|src|deb) ;;
- *) echo "Unknown install method"
- exit 1 ;;
+ rpm|src|deb) ;;
+ *) echo "Unknown install method"
+ exit 1 ;;
esac
case $INSTALL_OS in
- debian*|centos*) ;;
- *) echo "Unknown install OS"
- exit 1 ;;
+ debian*|centos*) ;;
+ *) echo "Unknown install OS"
+ exit 1 ;;
esac
+fix_httpd_itk() {
+ case $INSTALL_OS in
+ centos*)
+ echo 'WARNING: WORKAROUND for docker/lxc. Downgrade
httpd-itk.'
+ echo 'TODO: check for newer version. Debian not
impacted.'
+ curl
https://kojipkgs.fedoraproject.org//packages/httpd-itk/2.4.7.04/1.el7/x86_64/httpd-itk-2.4.7.04-1.el7.x86_64.rpm
-o /tmp/httpd-itk-2.4.7.04-1.el7.x86_64.rpm
+ yum downgrade -y
/tmp/httpd-itk-2.4.7.04-1.el7.x86_64.rpm
+ rm -f /tmp/httpd-itk-2.4.7.04-1.el7.x86_64.rpm
+ service httpd restart || true
+ ;;
+ esac
+}
install_selenium() {
- # Selenium dependencies and test dependencies
- # psmisc for db_reload.sh:killall
- # rsyslog to get e.g. sshd error log
- if [ -e /etc/debian_version ]; then
- apt-get -y install wget default-jre iceweasel
- apt-get -y install phpunit phpunit-selenium patch psmisc patch rsyslog
- else
- yum -y install wget firefox
- if yum list java-1.7.0-openjdk >/dev/null 2>&1 ; then
- yum install -y java-1.7.0-openjdk
+ # Selenium dependencies and test dependencies
+ # psmisc for db_reload.sh:killall
+ # rsyslog to get e.g. sshd error log
+ if [ -e /etc/debian_version ]; then
+ apt-get -y install wget default-jre iceweasel
+ apt-get -y install phpunit phpunit-selenium patch psmisc patch
rsyslog
else
- yum install -y java-1.6.0
+ yum -y install wget firefox
+ if yum list java-1.7.0-openjdk >/dev/null 2>&1 ; then
+ yum install -y java-1.7.0-openjdk
+ else
+ yum install -y java-1.6.0
+ fi
+ yum --enablerepo=epel install -y php-phpunit-PHPUnit
php-phpunit-PHPUnit-Selenium psmisc patch net-tools
+ fi
+
+ # Install selenium (no packaged version available)
+ SELENIUMMAJOR=2
+ SELENIUMMINOR=53
+ SELENIUMMICRO=0
+
SELENIUMURL=http://selenium-release.storage.googleapis.com/$SELENIUMMAJOR.$SELENIUMMINOR/selenium-server-standalone-$SELENIUMMAJOR.$SELENIUMMINOR.$SELENIUMMICRO.jar
+ mkdir -p /usr/share/selenium/
+ http_proxy=$PROXY wget -c $SELENIUMURL \
+ -O /usr/share/selenium/selenium-server.jar
+
+ # Add alias to /etc/hosts
+ if ! grep -q ^$(hostname -i) /etc/hosts ; then
+ echo $(hostname -i) $(hostname -f) $(hostname)>> /etc/hosts
fi
- yum --enablerepo=epel install -y php-phpunit-PHPUnit
php-phpunit-PHPUnit-Selenium psmisc patch net-tools
- fi
-
- # Install selenium (no packaged version available)
- SELENIUMMAJOR=2
- SELENIUMMINOR=53
- SELENIUMMICRO=0
-
SELENIUMURL=http://selenium-release.storage.googleapis.com/$SELENIUMMAJOR.$SELENIUMMINOR/selenium-server-standalone-$SELENIUMMAJOR.$SELENIUMMINOR.$SELENIUMMICRO.jar
- mkdir -p /usr/share/selenium/
- http_proxy=$PROXY wget -c $SELENIUMURL \
- -O /usr/share/selenium/selenium-server.jar
-
- # Add alias to /etc/hosts
- if ! grep -q ^$(hostname -i) /etc/hosts ; then
- echo $(hostname -i) $(hostname -f) $(hostname)>> /etc/hosts
- fi
- grep -q "^$(hostname -i).*$(forge_get_config scm_host)" /etc/hosts || sed
-i -e "s/^$(hostname -i).*/& $(forge_get_config scm_host)/" /etc/hosts
-
- # Fix screenshot default black background (/usr/share/{php,pear}) (fix
available upstream)
- patch -N /usr/share/*/PHPUnit/Extensions/SeleniumTestCase.php <<'EOF' ||
true
+ grep -q "^$(hostname -i).*$(forge_get_config scm_host)" /etc/hosts ||
sed -i -e "s/^$(hostname -i).*/& $(forge_get_config scm_host)/" /etc/hosts
+
+ # Fix screenshot default black background (/usr/share/{php,pear}) (fix
available upstream)
+ patch -N /usr/share/*/PHPUnit/Extensions/SeleniumTestCase.php <<'EOF'
|| true
--- /usr/share/php/PHPUnit/Extensions/SeleniumTestCase.php-dist
2014-02-10 19:48:34.000000000 +0000
+++ /usr/share/php/PHPUnit/Extensions/SeleniumTestCase.php 2014-09-01
10:09:38.823051288 +0000
@@ -1188,7 +1188,7 @@
!empty($this->screenshotUrl)) {
$filename = $this->getScreenshotPath() . $this->testId . '.png';
-
+
- $this->drivers[0]->captureEntirePageScreenshot($filename);
+ $this->drivers[0]->captureEntirePageScreenshot($filename,
'background=#CCFFDD');
-
+
return 'Screenshot: ' . $this->screenshotUrl . '/' .
$this->testId . ".png\n";
EOF
@@ -101,23 +113,25 @@ EOF
# Mitigate testsuite timeouts, cf.
#
http://lists.fusionforge.org/pipermail/fusionforge-general/2015-November/002955.html
fixup_nss() {
- conf=''
- case $INSTALL_OS in
- debian*)
- if ! grep -q '^export PGPASSFILE' /etc/apache2/envvars; then
- echo 'export PGPASSFILE=' >> /etc/apache2/envvars
- fi
- ;;
- centos*)
- if ! grep -q '^PGPASSFILE' /etc/sysconfig/httpd; then
- echo 'PGPASSFILE=' >> /etc/sysconfig/httpd
- fi
- ;;
- esac
+ conf=''
+ case $INSTALL_OS in
+ debian*)
+ if ! grep -q '^export PGPASSFILE' /etc/apache2/envvars; then
+ echo 'export PGPASSFILE=' >> /etc/apache2/envvars
+ fi
+ ;;
+ centos*)
+ if ! grep -q '^PGPASSFILE' /etc/sysconfig/httpd; then
+ echo 'PGPASSFILE=' >> /etc/sysconfig/httpd
+ fi
+ ;;
+ esac
}
fixup_nss
+fix_httpd_itk
+
install_selenium
service cron stop || true
@@ -175,25 +189,25 @@ PATH=/usr/lib/iceweasel:/usr/lib64/firefox:$PATH LANG=C
java -jar /usr/share/sel
pid=$!
i=0
while [ $i -lt $timeout ] && ! netstat -tnl 2>/dev/null | grep -q :4444 &&
kill -0 $pid 2>/dev/null; do
- echo "Waiting for Selenium..."
- sleep 1
- i=$(($i+1))
-done
-if [ $i = $timeout ]; then
- echo "Selenium failed to start listener… lacking entropy? Trying again."
- find / > /dev/null 2> /dev/null &
- i=0
- while [ $i -lt $timeout ] && ! netstat -tnl 2>/dev/null | grep -q :4444 &&
kill -0 $pid 2>/dev/null; do
echo "Waiting for Selenium..."
sleep 1
i=$(($i+1))
- done
+done
+if [ $i = $timeout ]; then
+ echo "Selenium failed to start listener… lacking entropy? Trying again."
+ find / > /dev/null 2> /dev/null &
+ i=0
+ while [ $i -lt $timeout ] && ! netstat -tnl 2>/dev/null | grep -q :4444
&& kill -0 $pid 2>/dev/null; do
+ echo "Waiting for Selenium..."
+ sleep 1
+ i=$(($i+1))
+ done
fi
if [ $i = $timeout ] || ! kill -0 $pid 2>/dev/null; then
- echo "Selenium failed to start!"
- netstat -tnl
- kill -9 $pid
- exit 1
+ echo "Selenium failed to start!"
+ netstat -tnl
+ kill -9 $pid
+ exit 1
fi
echo "Running PHPunit tests"
@@ -204,7 +218,7 @@ cd $(dirname $0)/
# Use the TESTGLOB environment variable otherwise
testname="func_tests.php"
if [ -n "$1" ] ; then
- testname="$1"
+ testname="$1"
fi
timeout 2h phpunit --verbose --debug --stop-on-failure --log-junit
$SELENIUM_RC_DIR/phpunit-selenium.xml $testname || retcode=$?
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c6c4df80ce85f7bf53d3f789907e83945f4da360
commit c6c4df80ce85f7bf53d3f789907e83945f4da360
Author: Franck Villaume <[email protected]>
Date: Mon Aug 14 14:05:34 2017 +0200
space vs. tab
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 1405bb2..7cbd3f2 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -26,21 +26,21 @@ set -e
# Install FusionForge dependencies
if [ -e /etc/debian_version ]; then
- export DEBIAN_FRONTEND=noninteractive
- backports_deb
- apt-get update
- apt-get install -y make gettext php5-cli php5-pgsql php-htmlpurifier
php-http php-text-captcha \
- libapache2-mpm-itk libapache2-mod-svn \
- libapache2-mod-php5 \
- apache2 postgresql postgresql-contrib libnss-pgsql2 unscd \
- cvs subversion viewvc python-pycurl git mercurial xinetd \
- python-moinmoin libapache2-mod-wsgi python-psycopg2 \
- unoconv poppler-utils dpkg-dev \
- vsftpd \
- fonts-dejavu-core
- if ! dpkg-vendor --is Ubuntu; then
- apt-get install locales-all #
https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
- fi
+ export DEBIAN_FRONTEND=noninteractive
+ backports_deb
+ apt-get update
+ apt-get install -y make gettext php5-cli php5-pgsql php-htmlpurifier
php-http php-text-captcha \
+ libapache2-mpm-itk libapache2-mod-svn \
+ libapache2-mod-php5 \
+ apache2 postgresql postgresql-contrib libnss-pgsql2 unscd \
+ cvs subversion viewvc python-pycurl git mercurial xinetd \
+ python-moinmoin libapache2-mod-wsgi python-psycopg2 \
+ unoconv poppler-utils dpkg-dev \
+ vsftpd \
+ fonts-dejavu-core
+ if ! dpkg-vendor --is Ubuntu; then
+ apt-get install locales-all #
https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
+ fi
elif [ -e /etc/SuSE-release ]; then
suse_check_release
suse_install_repos
@@ -58,32 +58,32 @@ elif [ -e /etc/SuSE-release ]; then
mediawiki moinmoin-wiki \
vsftpd
else
- yum install -y make tar
- backports_rpm
- yum --enablerepo=epel install -y httpd-itk
- yum install -y gettext php-cli php-pgsql php-process php-mbstring
php-pear-HTTP php-pear-Text-CAPTCHA \
- httpd mod_dav_svn mod_ssl postgresql-server postgresql-contrib nscd \
- cvs subversion viewvc python-pycurl git gitweb mercurial xinetd \
- moin mod_wsgi python-psycopg2 \
- unoconv poppler-utils libreoffice-headless \
- mediawiki php-markdown \
- vsftpd \
- dejavu-fonts-common
+ yum install -y make tar
+ backports_rpm
+ yum --enablerepo=epel install -y httpd-itk
+ yum install -y gettext php-cli php-pgsql php-process php-mbstring
php-pear-HTTP php-pear-Text-CAPTCHA \
+ httpd mod_dav_svn mod_ssl postgresql-server postgresql-contrib
nscd \
+ cvs subversion viewvc python-pycurl git gitweb mercurial xinetd
\
+ moin mod_wsgi python-psycopg2 \
+ unoconv poppler-utils libreoffice-headless \
+ mediawiki php-markdown \
+ vsftpd \
+ dejavu-fonts-common
fi
(
- cd $(dirname $0)/../src/
- make
- make install-base install-shell install-scm \
- install-plugin-scmcvs install-plugin-scmsvn install-plugin-scmgit
install-plugin-scmhg \
- install-plugin-blocks install-plugin-moinmoin \
- install-plugin-taskboard install-plugin-message \
- install-plugin-repositoryapi
- if [ -e /etc/centos-release ]; then
- make install-plugin-mediawiki
- fi
- if [ -e /etc/centos-release -o -e /etc/debian-release ]; then
- make install-plugin-phptextcaptcha
- fi
- make post-install
+ cd $(dirname $0)/../src/
+ make
+ make install-base install-shell install-scm \
+ install-plugin-scmcvs install-plugin-scmsvn
install-plugin-scmgit install-plugin-scmhg \
+ install-plugin-blocks install-plugin-moinmoin \
+ install-plugin-taskboard install-plugin-message \
+ install-plugin-repositoryapi
+ if [ -e /etc/centos-release ]; then
+ make install-plugin-mediawiki
+ fi
+ if [ -e /etc/centos-release -o -e /etc/debian-release ]; then
+ make install-plugin-phptextcaptcha
+ fi
+ make post-install
)
-----------------------------------------------------------------------
Summary of changes:
autoinstall/install-src.sh | 80 +++++++++++-----------
tests/func_tests.sh | 162 ++++++++++++++++++++++++---------------------
2 files changed, 128 insertions(+), 114 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
