summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2009-05-16 15:20:06 +0000
committerBill Peck <bpeck@redhat.com>2009-05-16 15:20:06 +0000
commit8773a6ad3a5ed99e277e9af470c87bbc426a63f8 (patch)
treec7e7ca618a6f4f4ebbf795d5ebadf6bdb659ff26
parentf211cca0d7eeff690017148f57eed255643ae8f6 (diff)
fix rpm location and config function namerh-tests-distribution-beaker-setup-1_1-9
-rwxr-xr-xTasks/distribution/beaker/setup/runtest.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/Tasks/distribution/beaker/setup/runtest.sh b/Tasks/distribution/beaker/setup/runtest.sh
index 96cf111..cc559d3 100755
--- a/Tasks/distribution/beaker/setup/runtest.sh
+++ b/Tasks/distribution/beaker/setup/runtest.sh
@@ -86,13 +86,13 @@ function BuildBeaker ()
function InstallInventory()
{
BuildBeaker
- yum install --nogpg -y beaker/Medusa/dist/beaker-server-*.rpm
+ yum install --nogpg -y /rpmbuild/RPMS/noarch/beaker-server-*.rpm
}
function InstallLabController()
{
BuildBeaker
- yum install --nogpg -y beaker/Medusa/dist/beaker-lab-controller-*.rpm
+ yum install --nogpg -y /rpmbuild/RPMS/noarch/beaker-lab-controller-*.rpm
}
function CleanUp ()
@@ -111,7 +111,7 @@ function estatus_fail()
fi
}
-function generate_beaker()
+function generate_beaker_cfg()
{
cat << __EOF__ > /etc/beaker/server.cfg
[global]