summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2013-06-14 07:04:47 +0000
committerGerrit Code Review <gerrit@beaker-project.org>2013-06-14 07:04:47 +0000
commit3a02ce6559c9bad3c5252b69995bad4686df7b62 (patch)
treeb3019d1fceef64c6bfc7d0db00a0fdcd3e286995
parente5a849206f4980f28028bfa8732acba76eeffca5 (diff)
parent049188b3ae2ecc151f40e1234bb5f78ade0f3871 (diff)
Merge "/distribution/beaker/setup: allow merging with base ref, instead of just checking out" into developbeaker-distribution-beaker-setup-1_4-95
-rwxr-xr-xTasks/distribution/beaker/setup/runtest.sh13
1 files changed, 7 insertions, 6 deletions
diff --git a/Tasks/distribution/beaker/setup/runtest.sh b/Tasks/distribution/beaker/setup/runtest.sh
index 6c50b4b..56b588a 100755
--- a/Tasks/distribution/beaker/setup/runtest.sh
+++ b/Tasks/distribution/beaker/setup/runtest.sh
@@ -24,14 +24,15 @@ function BuildBeaker ()
rlPhaseStartTest "Build Beaker from git"
rlRun "git clone git://git.beaker-project.org/beaker"
rlRun "pushd beaker"
+ rlRun "git checkout ${BEAKER_GIT_REF:-develop}"
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}"
+ rlRun "git fetch $BEAKER_GIT_REMOTE ${BEAKER_GIT_REMOTE_REF:-develop}"
+ rlRun "git ${BEAKER_GIT_REMOTE_MERGE:-checkout} FETCH_HEAD" \
+ || rlDie "Git checkout/merge failed"
fi
rlRun "yum-builddep -y ./beaker.spec"
rlRun "yum -y install tito"
- rlRun "tito build --rpm --test"
+ rlRun "tito build --rpm --test" || rlDie "Tito RPM build failed"
rlRun "popd"
rlRun "createrepo /tmp/tito/noarch/"
cat >/etc/yum.repos.d/beaker-local-builds.repo <<"EOF"
@@ -128,7 +129,7 @@ function Inventory()
rlPhaseEnd
rlPhaseStartTest "Install Beaker server"
- InstallInventory$SOURCE
+ InstallInventory$SOURCE || rlDie "Installing Beaker server failed"
rlPhaseEnd
rlPhaseStartTest "Configure Beaker server"
@@ -218,7 +219,7 @@ EOF
function LabController()
{
rlPhaseStartTest "Install Beaker lab controller"
- InstallLabController$SOURCE
+ InstallLabController$SOURCE || rlDie "Installing lab controller failed"
rlPhaseEnd
rlPhaseStartTest "Configure Beaker lab controller"