diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-25 20:08:42 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-25 20:10:02 -0600 |
| commit | 8f68409eecb64ae6eadf8ae796336e303849aba1 (patch) | |
| tree | 5e7df6bf16c4c91d6de147b4398d687a0522003b | |
| parent | a829ae6e24f132e6e05d5a3230509bca8fc75180 (diff) | |
tb: source per branch phases.sh if exist
| -rwxr-xr-x | tb/tb | 4 | ||||
| -rw-r--r-- | tb/tb_internals.sh | 9 |
2 files changed, 11 insertions, 2 deletions
@@ -159,7 +159,7 @@ TB_DEFAULT_PROFILE=<profile_name> Default profile name. This is a G level only parameter This provide a default value in case -p <prifle> is not present on the command line, but is required. -TB_GERRIT_HOST<host> Gerrit host to contact in gerrit mode. +TB_GERRIT_HOST=<host> Gerrit host to contact in gerrit mode. This parameter is mandatory to use a gerrit mode. This is G or P-level parameter only TB_GIT_DIR=<path> Location of the libreoffice core git repo to use for a build. @@ -205,7 +205,7 @@ TB_SMTP_PASSWORD=<password> Password associated with TB_SMTP_USER. This paramter is mandatory if TB_SMTP_USER is specified TB_SMTP_USER=<username> Username to login to the smtp server. If your smtp server does not require authotification, you can omit this. -TB_TINDERBOX_BRANCH=<name> Name associated witha branch on the tibderbox server. +TB_TINDERBOX_BRANCH=<name> Name associated with a branch on the tinderbox server. The tinderbox server need to have a branch name assocaited with any build repport. the server only recognize a preset list of such name and they do not necessarely match you local branch name. diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh index b857d45..07cf6fd 100644 --- a/tb/tb_internals.sh +++ b/tb/tb_internals.sh @@ -73,6 +73,9 @@ # /profiles/<profile_name>/branches/<branch_name>/config_gerrit # /profiles/<profile_name>/branches/<branch_name>/config_tb # /profiles/<profile_name>/branches/<branch_name>/false_negatives +# /profiles/<profile_name>/branches/<branch_name>/phase.sh +# /profiles/<profile_name>/branches/<branch_name>/phase_gerrit.sh +# /profiles/<profile_name>/branches/<branch_name>/phase_tb.sh # /profiles/<profile_name>/config # /profiles/<profile_name>/false_negatives # /profiles/<profile_name>/phases.sh @@ -1540,6 +1543,12 @@ source_branch_level_config() if [ -z "${TB_TINDERBOX_BRANCH}" ] ; then TB_TINDERBOX_BRANCH=$(determine_default_tinderbox_branch "${b?}") fi + if [ -f "${tb_PROFILE_DIR?}/branches/${b?}/phase.sh" ] ; then + source "${tb_PROFILE_DIR?}/branches/${B?}/phase.sh" + fi + if [ -f "${tb_PROFILE_DIR?}/branches/${b?}/phase_${t?}.sh" ] ; then + source "${tb_PROFILE_DIR?}/branches/${b?}/phase_${t?}.sh" + fi } # |