Add archive step to lldb mac builder, combine first build and retry step

[chying]

Summary

• Add archive step
• Set flunkOnFailure to False for archive step
• Combine build and retry step to one using || to get buildbot green

[sivachandra]

LGTM with nits. Also, I am assuming it was tested.

zorg/buildbot/builders/LLDBBuilder.py

526

Lines 525 and 526 can be on the same line.

531

Lines 530 and 531 can be on the same line.

782

Line 781 and 782 can be on one line.

[chying]

fix a few nits

[vharron]

zorg/buildbot/builders/LLDBBuilder.py

526

Please add a comment, something like

1. this glob will include trace results for all compilers/archs
2. one example: build/lldb-test-trace-x86_64-clang

536

I think we should flunk if the zip fails. What do you think?

766

You should probably keep all python variable names lower case.

zorg/buildbot/builders/LLDBBuilder.py

def getLLDBUbuntuCMakeBuildFactory(build_compiler,
     if remote_configs is not None:
         for config in remote_configs:
             f = getLLDBRemoteTestSteps(f,
                                        bindir,
                                        build_type,
                                        config,
                                        env)
     # archive test traces
-    f = archiveLLDBTestTraces(f)
+    f = archiveLLDBTestTraces(f,
+                              "build/lldb-test-traces-*")
     return f
 
 # zip and upload test traces to google storage
-def archiveLLDBTestTraces(f):
-    llvm_builddir = 'build'
+def archiveLLDBTestTraces(f,
+                          test_trace):
     f.addStep(ShellCommand(name="compress test traces",
-                           command=WithProperties("zip -r build-%(buildnumber)s lldb-test-traces-*"),
+                           command=WithProperties("zip -r build-%(buildnumber)s " + test_trace),
                            description="zip",
                            haltOnFailure=False,
-                           workdir='%s' % llvm_builddir))
+                           flunkOnFailure=False,
+                           workdir='.'))
     f.addStep(ShellCommand(name="upload test traces",
                            command=['gsutil',
                                     'mv',
                                     WithProperties('build-%(buildnumber)s.zip'),
                                     WithProperties('gs://lldb_test_traces/%(buildername)s/')],
                            description="upload to Google Storage",
                            haltOnFailure=False,
-                           workdir='%s' % llvm_builddir))
+                           flunkOnFailure=False,
+                           workdir='.'))
     return f
 
 # for cmake and compile
 def getLLDBCmakeAndCompileSteps(f,
                                 build_compiler,
                                 build_type,
                                 ninja_target,
                                 bindir,
f.addStep(ShellCommand(name='check.keychain',
                            workdir=WithProperties('%(builddir)s')))
     f.addStep(ShellCommand(name='find.certificate',
                            command=['security', 'find-certificate', '-c',
                                     'lldb_codesign'],
                            haltOnFailure=True,
                            workdir=WithProperties('%(builddir)s')))
 # Building the sources
 #
+    buildcmd = ' '.join(['xcrun',
+                         'xcodebuild',
+                         '-workspace',
+                         'lldb.xcworkspace',
+                         '-scheme',
+                         'lldb-tool',
+                         '-configuration',
+                         'Debug',
+                         'SYMROOT=' + OBJROOT,
+                         'OBJROOT=' + OBJROOT])
     f.addStep(ShellCommand(name='lldb-build',
-                           command=['xcrun', 'xcodebuild', '-workspace',
-                                    'lldb.xcworkspace', '-scheme', 'lldb-tool',
-                                    '-configuration', 'Debug',
-                                    WithProperties('SYMROOT=' + OBJROOT),
-                                    WithProperties('OBJROOT=' + OBJROOT)],
-                           haltOnFailure=False,
-                           workdir=lldb_srcdir))
-
-# Currently the first build always fail, so ignore the first result and add retry as workaround
-
-    f.addStep(ShellCommand(name='lldb-build-Retry',
-                           command=['xcrun', 'xcodebuild', '-workspace',
-                                    'lldb.xcworkspace', '-scheme', 'lldb-tool',
-                                    '-configuration', 'Debug',
-                                    WithProperties('SYMROOT=' + OBJROOT),
-                                    WithProperties('OBJROOT=' + OBJROOT)],
+                           command=WithProperties(buildcmd + " || " + buildcmd),
                            haltOnFailure=True,
                            workdir=lldb_srcdir))
+
 # Testing
 #
     if not use_cc:
         use_cc = '/Applications/Xcode.app/Contents/Developer/Toolchains/'
         use_cc += 'XcodeDefault.xctoolchain/usr/bin/clang'
         f.addStep(SetProperty(name='set.cc',
                   command=['xcrun', '-find', 'clang'],
                   property='use_cc',
                   description='set cc',
                   workdir=lldb_srcdir))
     else:
         f.addStep(SetProperty(name='set.cc',
                   command=['echo', use_cc],
                   property='use_cc',
                   description='set cc',
                   workdir=lldb_srcdir))
-
+    DOTEST_OPTS = ' '.join(['-m',
+                            '--executable',
+                            '%(lldb_bindir)s/lldb',
+                            '--framework', '%(lldb_bindir)s/LLDB.framework',
+                            '-A', 'x86_64',
+                            '-C', 'clang',
+                            '-s', '../DerivedData/lldb-test-results'])
     f.addStep(LitTestCommand(name='lldb-test',
                              command=['./dosep.py',
                                       '--options',
-                                      WithProperties('-m --executable %(lldb_bindir)s/lldb --framework %(lldb_bindir)s/LLDB.framework -A x86_64 -C clang -s ../DerivedData/lldb-test-results')],
-                             haltOnFailure=True,
+                                      WithProperties(DOTEST_OPTS)],
+                             haltOnFailure=False,
                              workdir='%s/test' % lldb_srcdir,
                              env={'DYLD_FRAMEWORK_PATH' : WithProperties('%(lldb_bindir)s')}))
+# Compress and upload test log
+    f = archiveLLDBTestTraces(f,
+                              "lldb.src/DerivedData/lldb-test-results")
 
 # Results go in a directory coded named according to the date and time of the test run, e.g.:
 #
 # 2012-10-16-11_26_48/Failure-x86_64-_Applications_Xcode.app_Contents_Developer_Toolchains_XcodeDefault.xctoolchain_usr_bin_clang-TestLogging.LogTestCase.test_with_dsym.log
 #
 # Possible results are ExpectedFailure, Failure, SkippedTest, UnexpectedSuccess, and Error.    return f
     return f