[zorg] r178436 - [lvmlab] Always svn clean before attempting to update sources.

[Michael Gottesman]

Author: mgottesman
Date: Sat Mar 30 18:43:59 2013
New Revision: 178436

URL: http://llvm.org/viewvc/llvm-project?rev=178436&view=rev
Log:
[lvmlab] Always svn clean before attempting to update sources.

Sometimes builds need to have an svn cleanup before we can do a pull due
to schenanigans. svn cleanup is generally quick when nothing needs to be
fixed up. Thus just always perform svn cleanup to eliminate this source
of error.

Modified:
    zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

Modified: zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py?rev=178436&r1=178435&r2=178436&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py (original)
+++ zorg/trunk/zorg/buildbot/PhasedBuilderUtils.py Sat Mar 30 18:43:59 2013
@@ -278,3 +278,14 @@ def set_config_option(section, option, d
         warn_str += '"%s" section of your local.cfg file' % section
         warnings.warn(warn_str) 
         return default
+
+
+def SVNCleanupStep(f, name):
+  f.addStep(buildbot.steps.shell.ShellCommand(
+      name='svn.cleanup.%s' % name,
+      command=['svn', 'cleanup'],
+      haltOnFailure=False, flunkOnFailure=False,
+      description='svn cleanup %s just in case' % name,
+      workdir=name))
+  return f
+

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=178436&r1=178435&r2=178436&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Sat Mar 30 18:43:59 2013
@@ -14,7 +14,7 @@ from zorg.buildbot.commands import Suppr
 from zorg.buildbot.commands.BatchFileDownload import BatchFileDownload
 from zorg.buildbot.commands.LitTestCommand import LitTestCommand
 from zorg.buildbot.PhasedBuilderUtils import GetLatestValidated, find_cc
-from zorg.buildbot.PhasedBuilderUtils import find_liblto
+from zorg.buildbot.PhasedBuilderUtils import find_liblto, SVNCleanupStep
 
 def getClangBuildFactory(
             triple=None,
@@ -667,20 +667,24 @@ def phasedClang(config_options, is_boots
             haltOnFailure=False, description=['rm', 'compiler-rt sources link'],
             workdir=WithProperties('%(builddir)s')))
     # Pull sources.
+    f = SVNCleanupStep(f, 'llvm')
     f.addStep(HostSVN(name='pull.llvm', mode='incremental', method='fresh',
                       repourl='http://llvm.org/svn/llvm-project/llvm/trunk',
                       retry=(60, 5), workdir='llvm', description='pull.llvm',
                       alwaysUseLatest=False))
+    f = SVNCleanupStep(f, 'clang.src')
     f.addStep(HostSVN(name='pull.clang', mode='incremental', method='fresh',
                       repourl='http://llvm.org/svn/llvm-project/cfe/trunk',
                       workdir='clang.src', retry=(60, 5),
                       description='pull.clang', alwaysUseLatest=False))
+    f = SVNCleanupStep(f, 'clang-tools-extra.src')
     f.addStep(HostSVN(name='pull.clang-tools-extra', mode='incremental',
                       method='fresh',
                       repourl='http://llvm.org/svn/llvm-project/'
                               'clang-tools-extra/trunk',
                       workdir='clang-tools-extra.src', alwaysUseLatest=False,
                       retry=(60, 5), description='pull.clang-tools-extra'))
+    f = SVNCleanupStep(f, 'compiler-rt.src')
     f.addStep(HostSVN(name='pull.compiler-rt', mode='incremental',
                       method='fresh',
                       repourl='http://llvm.org/svn/llvm-project/compiler-rt/'