summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Saha <asaha@redhat.com>2013-08-26 06:32:05 +0000
committerGerrit Code Review <gerrit@beaker-project.org>2013-08-26 06:32:05 +0000
commit4d86c79355266aa9a8824ef25c8ffc2c96f98736 (patch)
tree758fc167e4900eb62afb7affce0770da595601cc
parent51904bec73e45936f068834d3bf1d9691ba367ba (diff)
parent58a08a949768b56b5a6b81d98194282475314e0a (diff)
Merge "Changes to test scripts and dogfood task:" into developbeaker-distribution-beaker-dogfood-1_2-1
-rw-r--r--IntegrationTests/src/bkr/inttest/server/selenium/__init__.py2
-rwxr-xr-x[-rw-r--r--]Misc/beaker_test_setup.sh39
-rw-r--r--Tasks/distribution/beaker/dogfood/Makefile4
3 files changed, 29 insertions, 16 deletions
diff --git a/IntegrationTests/src/bkr/inttest/server/selenium/__init__.py b/IntegrationTests/src/bkr/inttest/server/selenium/__init__.py
index c0f4513..a8178df 100644
--- a/IntegrationTests/src/bkr/inttest/server/selenium/__init__.py
+++ b/IntegrationTests/src/bkr/inttest/server/selenium/__init__.py
@@ -150,7 +150,7 @@ def setup_package():
'-screen', '0', '1024x768x24'], listen_port=6004),
Process('selenium-server', args=['java',
'-Djava.io.tmpdir=/tmp/selenium',
- '-jar', '/usr/local/share/selenium/selenium-server-standalone-2.33.0.jar',
+ '-jar', '/usr/local/share/selenium/selenium-server-standalone-2.35.0.jar',
'-log', 'selenium.log'], env={'DISPLAY': ':4'},
listen_port=4444),
])
diff --git a/Misc/beaker_test_setup.sh b/Misc/beaker_test_setup.sh
index 455cffd..f3fec93 100644..100755
--- a/Misc/beaker_test_setup.sh
+++ b/Misc/beaker_test_setup.sh
@@ -4,23 +4,37 @@
# and copies selenium JAR to the appropriate location. All of these
# are needed to run Beaker's test suite.
-# Tested on Fedora 18
+# Tested on Fedora 19+20
# You should run this as root
# Abort if any of these fails
set -e
-# Beaker server repository
-wget -O /etc/yum.repos.d/beaker-server.repo http://beaker-project.org/yum/beaker-server-Fedora.repo
+# create beaker RPMs
+
+pushd ../
+
+yum-builddep -y beaker.spec
+yum -y install tito createrepo
+tito build --test --rpm
+createrepo --no-database /tmp/tito/noarch
+
+cat >/etc/yum.repos.d/beaker-local-builds.repo <<"EOF"
+[tito]
+name=tito
+baseurl=file:///tmp/tito/noarch/
+EOF
+
+popd
# Find the dependencies
yum deplist beaker-server beaker-lab-controller beaker-integration-tests beaker-client beaker | grep 'provider' | grep -v 'beaker*' | awk '{print $2'} | sort -u > beaker_deplist
-# Need this for doing a make which sets up the path for the integration
-# TODO: Perhaps worth fixing this.
-echo "python-sphinx" >> beaker_deplist
+# others
echo "git" >> beaker_deplist
-echo "mysql-server" >> beaker_deplist
+echo "mariadb-server" >> beaker_deplist
+echo "mariadb" >> beaker_deplist
+echo "openldap-servers" >> beaker_deplist
# Install them
while read line
@@ -28,16 +42,15 @@ do
yum -y install `yum info $line | grep 'Name' | awk '{print $3}'`
done <beaker_deplist
-#setup mysql
+
+#setup mariadb
cp /etc/my.cnf /etc/my.cnf-orig
cat /etc/my.cnf-orig | awk '
- {print $1};
+ {print $0};
/\[mysqld\]/ {
- print "default-storage-engine=INNODB";
- print "max_allowed_packet=50M";
print "character-set-server=utf8";
}' > /etc/my.cnf
-service mysqld restart
+systemctl restart mysqld
echo "CREATE DATABASE beaker_test;" | mysql
echo "GRANT ALL ON beaker_test.* TO 'beaker'@'localhost' IDENTIFIED BY
'beaker';" | mysql
@@ -45,5 +58,5 @@ echo "GRANT ALL ON beaker_test.* TO 'beaker'@'localhost' IDENTIFIED BY
# Download selenium JAR
mkdir -p /usr/local/share/selenium
pushd /usr/local/share/selenium
-wget http://selenium.googlecode.com/files/selenium-server-standalone-2.33.0.jar
+wget http://selenium.googlecode.com/files/selenium-server-standalone-2.35.0.jar
popd
diff --git a/Tasks/distribution/beaker/dogfood/Makefile b/Tasks/distribution/beaker/dogfood/Makefile
index 8629a1e..77bb116 100644
--- a/Tasks/distribution/beaker/dogfood/Makefile
+++ b/Tasks/distribution/beaker/dogfood/Makefile
@@ -16,10 +16,10 @@
TOPLEVEL_NAMESPACE=distribution
PACKAGE_NAME=beaker
RELATIVE_PATH=dogfood
-export TESTVERSION=1.1
+export TESTVERSION=1.2
export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
-SELENIUM_SERVER_VERSION=2.33.0
+SELENIUM_SERVER_VERSION=2.35.0
.PHONY: all install download clean