summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2012-12-09 21:51:39 -0500
committerGerrit Code Review <gerrit@beaker-project.org>2012-12-09 21:51:39 -0500
commit69ba48a2ba27e0043ae88428891b2474bba30d36 (patch)
tree49f3d92762030047c90a565553864af752da413c
parent5113cc0329b4882d6f3029dbe07dcdbb6b9d018d (diff)
parent53af8b57ccfb5262b061f4aa6e806f32c15aafe7 (diff)
Merge "/distribution/beaker/setup: fix up git builds to actually work" into developbeaker-distribution-beaker-setup-1_4-84beaker-distribution-beaker-dogfood-1_1-38
-rwxr-xr-xTasks/distribution/beaker/dogfood/runtest.sh6
-rwxr-xr-xTasks/distribution/beaker/setup/runtest.sh18
2 files changed, 17 insertions, 7 deletions
diff --git a/Tasks/distribution/beaker/dogfood/runtest.sh b/Tasks/distribution/beaker/dogfood/runtest.sh
index cafdf88..f7c9629 100755
--- a/Tasks/distribution/beaker/dogfood/runtest.sh
+++ b/Tasks/distribution/beaker/dogfood/runtest.sh
@@ -16,7 +16,11 @@
# Author: Dan Callaghan <dcallagh@redhat.com>
rhts-run-simple-test $TEST/beakerd_stop "/sbin/service beakerd stop"
-rhts-run-simple-test $TEST/yum_install "yum install -y beaker-integration-tests$VERSION"
+if [[ "$SOURCE" == "git" ]] ; then
+ rhts-run-simple-test $TEST/yum_install_git "yum install -y /tmp/tito/noarch/beaker-integration-tests-*.rpm"
+else
+ rhts-run-simple-test $TEST/yum_install "yum install -y beaker-integration-tests$VERSION"
+fi
rhts-run-simple-test $TEST/update_config "./update-config.sh"
rhts-run-simple-test $TEST/httpd_reload "/sbin/service httpd reload"
rhts-run-simple-test $TEST "nosetests -v $NOSEARGS"
diff --git a/Tasks/distribution/beaker/setup/runtest.sh b/Tasks/distribution/beaker/setup/runtest.sh
index 43781c4..9c245ce 100755
--- a/Tasks/distribution/beaker/setup/runtest.sh
+++ b/Tasks/distribution/beaker/setup/runtest.sh
@@ -21,17 +21,23 @@
function BuildBeaker ()
{
- rlRun "yum install -y TurboGears python-setuptools-devel python-devel"
- rlRun "git clone git://git.fedorahosted.org/beaker"
+ rlRun "git clone git://git.beaker-project.org/beaker"
rlRun "pushd beaker"
+ if [[ -n "$BEAKER_GIT_REMOTE" ]] ; then
+ rlRun "git fetch $BEAKER_GIT_REMOTE ${BEAKER_GIT_REF:-master} && git checkout FETCH_HEAD"
+ else
+ rlRun "git checkout ${BEAKER_GIT_REF:-master}"
+ fi
+ rlRun "yum-builddep -y ./beaker.spec"
+ rlRun "yum -y install tito"
rlRun "tito build --rpm --test"
rlRun "popd"
}
function InstallInventory_git()
{
- BuildBeaker
- rlRun "yum install --nogpg -y /tmp/tito/RPMS/noarch/beaker-server-*.rpm"
+ [[ ! -d /tmp/tito/noarch ]] && BuildBeaker
+ rlRun "yum install --nogpg -y /tmp/tito/noarch/{beaker-[0-9]*,beaker-server-*}.rpm"
}
function InstallInventory_repo()
@@ -41,8 +47,8 @@ function InstallInventory_repo()
function InstallLabController_git()
{
- BuildBeaker
- rlRun "yum install --nogpg -y /tmp/tito/RPMS/noarch/beaker-lab-controller-*.rpm"
+ [[ ! -d /tmp/tito/noarch ]] && BuildBeaker
+ rlRun "yum install --nogpg -y /tmp/tito/noarch/{beaker-[0-9]*,beaker-lab-controller-*}.rpm"
}
function InstallLabController_repo()