From: Dan Scott Date: Sun, 15 May 2011 21:38:46 +0000 (-0400) Subject: Remove 'branches' reference in Buildbot branches test X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a537043af9e607e8cd7976e2464dc773f64e897a;p=working%2FOpenSRF.git Remove 'branches' reference in Buildbot branches test We can just check for the branch directly now that we are in git. Some things really are simpler with git! Signed-off-by: Dan Scott --- diff --git a/examples/buildbot.cfg b/examples/buildbot.cfg index 571b70c..f62e334 100644 --- a/examples/buildbot.cfg +++ b/examples/buildbot.cfg @@ -159,7 +159,7 @@ osrf_factory.addStep(shell.PerlModuleTest(workdir="build/src/perl")) # run the Python unit tests (available after rel_1_6) def has_python_unit_test(step): - return step.build.getProperty('branch') != 'branches/rel_1_6' + return step.build.getProperty('branch') != 'rel_1_6' osrf_factory.addStep(python_twisted.Trial( doStepIf=has_python_unit_test, @@ -216,9 +216,9 @@ class PerlModuleTestMFHDMadness(shell.PerlModuleTest): def has_perl_unit_tests(step): 'Only run Perl tests if there are tests' - if (step.build.getProperty('branch') == 'branches/rel_1_6_1'): + if (step.build.getProperty('branch') == 'rel_1_6_1'): return False - elif (step.build.getProperty('branch') == 'branches/rel_2_0'): + elif (step.build.getProperty('branch') == 'rel_2_0'): return False return True