tb/tb_internals.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 34805ae3569dbb783a87cbb3391d5319f5227521
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sun May 19 20:50:45 2013 -0500
tb: use TB_BRANCH to configure the branch a gerrit profile should query
diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index fa89fab..f6d87f9 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -467,7 +467,6 @@ profile_gerrit_defaults()
die "Could not determine gerrit platform for ${os}"
fi
fi
-
}
profile_tb_defaults()
@@ -993,7 +992,7 @@ select_next_gerrit_task()
GERRIT_TASK_BRANCH=""
GERRIT_TASK_REF=""
GERRIT_TASK_FEATURE=""
- result=$(ssh ${TB_GERRIT_HOST?} buildbot get -p core -a
${TB_GERRIT_PLATFORM?} --format BASH ${TB_GERRIT_BRANCH?} ${tb_GERRIT_TEST})
+ result=$(ssh ${TB_GERRIT_HOST?} buildbot get -p core -a
${TB_GERRIT_PLATFORM?} --format BASH ${TB_BRANCH?} ${tb_GERRIT_TEST})
[ $V ] && echo "Get task result:${result}"
has_task=$(echo "$result" | grep "^GERRIT_TASK_")
@@ -1281,6 +1280,9 @@ validate_gerrit_profile()
if [ -z "${TB_NAME}" ] ; then
die "TB_NAME is required to be configured"
fi
+ if [ -z "${TB_BRANCH}" ] ; then
+ die "TB_BRANCH is required to be configured"
+ fi
if [ -z "${TB_GIT_DIR}" ] ; then
die "TB_GIT_DIR is required to be configured"
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
