[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.5-7-g83cc08c
Franck Villaume
nerville at libremir.placard.fr.eu.org
Tue Sep 5 09:47:55 CEST 2017
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 83cc08c49492ef471752ae796a4d91a6386a5466 (commit)
from 786f5de98b1c896e8d1d3281699fae45d147adde (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=83cc08c49492ef471752ae796a4d91a6386a5466
commit 83cc08c49492ef471752ae796a4d91a6386a5466
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Tue Sep 5 07:47:46 2017 +0000
backport fix from master for itk and centos
diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index fda84e6..5060058 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -49,6 +49,18 @@ case $INSTALL_OS in
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
@@ -118,6 +130,8 @@ fixup_nss() {
fixup_nss
+fix_httpd_itk
+
install_selenium
service cron stop || true
-----------------------------------------------------------------------
Summary of changes:
tests/func_tests.sh | 14 ++++++++++++++
1 file changed, 14 insertions(+)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list