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 b42ac36030b81be952303da734ffd7c8647af822 (commit)
from 8f8ae0edcdd668603ffa08c631c2fc7115685156 (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=b42ac36030b81be952303da734ffd7c8647af822
commit b42ac36030b81be952303da734ffd7c8647af822
Author: Sylvain Beucler <[email protected]>
Date: Fri Sep 4 17:53:48 2015 +0200
testsuite: purge some obsolete variables
diff --git a/tests/buildbot/common-functions b/tests/buildbot/common-functions
index c9ea983..4f9b246 100644
--- a/tests/buildbot/common-functions
+++ b/tests/buildbot/common-functions
@@ -83,53 +83,3 @@ enabled=0
gpgcheck=0
EOF
}
-
-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"
- 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"
- 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
-}
diff --git a/tests/buildbot/common-vm b/tests/buildbot/common-vm
index b5bd61e..6800410 100644
--- a/tests/buildbot/common-vm
+++ b/tests/buildbot/common-vm
@@ -76,7 +76,7 @@ then
echo "$BASEHOST=`eval echo \\\$$BASEHOST`"
fi
-export HOST BASEHOST $BASEHOST SSHPUBKEY
+export HOST BASEHOST $BASEHOST
if [ -z "$VMENGINE" ]
then
diff --git a/tests/buildbot/config/default b/tests/buildbot/config/default
index a1def05..81f07be 100644
--- a/tests/buildbot/config/default
+++ b/tests/buildbot/config/default
@@ -1,10 +1,8 @@
-#
+# -*- shell-script -*-
# In this file you can find vars that are useable
# both as an include in a Makefile or
# be sourced in a shell
# So it should only be stuffs like VAR=value
-#
-SSHPUBKEY=~/.ssh/id_rsa.pub
# Do we keep vm at end of tests
KEEPVM=false
@@ -12,61 +10,8 @@ KEEPVM=false
# VM Engine currently supported lxc, openvz TODO kvm, virtualbox,...
VMENGINE=lxc
-# Web frontend
-FORGE_ADMIN_USERNAME=admin
-FORGE_ADMIN_PASSWORD=myadmin
-FORGE_OTHER_PASSWORD=tototata
-
-# Database
-DB_NAME=fusionforge
-DB_USER=forgeuser
-CONFIGURED=true
-
-# Debian mirrors
-DEBMIRROR=http://cdn.debian.net/debian/
+# LXC post-install
+# Debian security mirror
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
-
-# Debian 3rd-party
-DEB3RD=http://buildbot.fusionforge.org/job/3rd-party-deb-for-5.3/ws/build/debian/
-
-# Redhat 3rd-party
-RPM3RD=http://buildbot.fusionforge.org/job/3rd-party-rpm-for-5.3/ws/build/redhat/
-
-# The following is for static ip config samples
-# hostname=vmengine:template:address/mask:gateway
-# OpenVZ
-#vzdebian6=openvz:debian6:192.168.222.105/24:192.168.222.1
-#vzdebian6src=openvz:debian6:192.168.222.120/24:192.168.222.1
-#vzcentos5=openvz:centos5:192.168.222.110/24:192.168.222.1
-#vzcentos5src=openvz:centos5:192.168.222.115/24:192.168.222.1
-
-# LXC
-#debian6=lxc:debian6:192.168.222.105/24:192.168.222.1
-#debian6src=lxc:debian6:192.168.222.120/24:192.168.222.1
-#centos5=lxc:centos5:192.168.222.110/24:192.168.222.1
-#centos5src=lxc:centos5:192.168.222.115/24:192.168.222.1
-
-# For dhcpconfig
-#dhdebian6=lxc:debian6::
-#dhdebian6src=lxc:debian6::
-#dhcentos5=lxc:centos5::
-#dhcentos5src=lxc:centos5::
-
-# Trunk vm
-#fgcostrksrc=lxc:centos5::
-#fgcostrk=lxc:centos5::
-#fgdebtrk=lxc:debian6::
-
-# 5.1 vm
-#fgcos51src=lxc:centos5::
-#fgcos51=lxc:centos5::
-#fgdeb51=lxc:debian6::
-
-# Local Variables:
-# mode: sh
-# End:
diff --git a/tests/func/SeleniumForge.php b/tests/func/SeleniumForge.php
index 3a5dc23..6bece12 100644
--- a/tests/func/SeleniumForge.php
+++ b/tests/func/SeleniumForge.php
@@ -44,7 +44,11 @@
* ALONE BASIS."
*/
-$config = getenv('CONFIG_PHP') ? getenv('CONFIG_PHP'):
dirname(dirname(__FILE__)).'/config.php';
+define('FORGE_ADMIN_USERNAME', 'admin');
+define('FORGE_ADMIN_PASSWORD', 'myadmin');
+define('FORGE_OTHER_PASSWORD', 'tototata');
+
+$config = dirname(__FILE__).'/config.php';
require_once $config;
require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
@@ -156,7 +160,7 @@ class FForge_SeleniumTestCase extends
PHPUnit_Extensions_SeleniumTestCase
public function runCommand($cmd)
{
- system(RUN_COMMAND_PREFIX.$cmd, $ret);
+ system($cmd, $ret);
$this->assertEquals(0, $ret);
ob_flush();
}
@@ -174,11 +178,6 @@ class FForge_SeleniumTestCase extends
PHPUnit_Extensions_SeleniumTestCase
ob_flush();
}
- public function db($sql)
- {
- system("echo \"$sql\" | psql -q -Upostgres ".DB_NAME);
- }
-
public function cron($cmd)
{
$this->runCommand(RUN_JOB_PATH."/forge_run_job $cmd");
diff --git a/tests/func/phpunit-selenium.sh b/tests/func/phpunit-selenium.sh
index a1bb8da..9a898ba 100755
--- a/tests/func/phpunit-selenium.sh
+++ b/tests/func/phpunit-selenium.sh
@@ -54,10 +54,9 @@ SELENIUM_RC_DIR=/var/log
SELENIUM_RC_HOST=$HOST
# URL for screenshots - cf. http://buildbot.fusionforge.org/env-vars.html
SELENIUM_RC_URL=${JOB_URL}/ws/method/${INSTALL_METHOD}/os/${INSTALL_OS}/reports/
-# the PHP file provided through CONFIG_PHP will be loaded inside the
-# functionnal test suite with require_once, in SeleniumForge.php
-CONFIG_PHP=func/config.php
-export SELENIUM_RC_DIR SELENIUM_RC_URL SELENIUM_RC_HOST HOST DB_NAME DB_USER
CONFIG_PHP
+# config.php will be loaded inside the functionnal test suite with
+# require_once, in SeleniumForge.php
+export SELENIUM_RC_DIR SELENIUM_RC_URL SELENIUM_RC_HOST HOST
# Add definitions for the PHP functionnal test suite
cat <<-EOF >tests/func/config.php
@@ -72,16 +71,6 @@ define ('HOST', getenv('HOST'));
// Base URL where FusionForge is installed
define ('ROOT', '');
-// Database connection parameters.
-define('DB_NAME', getenv('DB_NAME'));
-define('DB_USER', getenv('DB_USER'));
-define('DB_PASSWORD', '@@FFDB_PASS@@');
-// Command which will reload a clean database at each SeleniumTestCase start
-define('DB_INIT_CMD', "$FORGE_HOME/tests/func/db_reload.sh 2>&1");
-
-// Prefix for commands to run
-define('RUN_COMMAND_PREFIX', '');
-
// Cronjob wrapper script location
print "Looking for forge_run_job script...\n";
if (is_executable ("$FORGE_HOME/bin/forge_run_job")) {
@@ -101,21 +90,6 @@ if (is_executable ("$FORGE_HOME/bin/forge_run_job")) {
define('INSTALL_METHOD', getenv('INSTALL_METHOD'));
define('INSTALL_OS', getenv('INSTALL_OS'));
-// this should be an existing user of the forge together with its password
-// (the password should be different from 'myadmin')
-define ('FORGE_ADMIN_USERNAME', '$FORGE_ADMIN_USERNAME');
-define ('FORGE_ADMIN_PASSWORD', '$FORGE_ADMIN_PASSWORD');
-define ('FORGE_OTHER_PASSWORD', '$FORGE_OTHER_PASSWORD');
-
-// Where CLI is installed
-define ('CLI_CMD', '$FORGE_HOME/acde/tools/gforge-cli/gforge.php');
-
-// Where Java CLI is installed
-define ('JAGOSI_CMD', '$FORGE_HOME/acde/tools/gforge-java-cli/');
-
-// Enter true when file is configured.
-define('CONFIGURED', getenv('CONFIGURED'));
-
//
// DON'T MODIFY BELOW THIS LINE UNLESS YOU KNOW WHAT YOU DO
//
-----------------------------------------------------------------------
Summary of changes:
tests/buildbot/common-functions | 50 ---------------------------------
tests/buildbot/common-vm | 2 +-
tests/buildbot/config/default | 61 ++---------------------------------------
tests/func/SeleniumForge.php | 13 ++++-----
tests/func/phpunit-selenium.sh | 32 ++-------------------
5 files changed, 13 insertions(+), 145 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
