[zorg] r204382 - Disable submitURL by default

[Renato Golin]

Author: rengolin
Date: Thu Mar 20 14:29:41 2014
New Revision: 204382

URL: http://llvm.org/viewvc/llvm-project?rev=204382&view=rev
Log:
Disable submitURL by default

Not all bots want to submit the test-suite results to perf, so
making the parameter null by default and requesting buildbots
to pass the URL at build time.

This will reduce the number of system failures given that the
perf system is rather unstable recently. In the long run it will
at least de-couple the failures from both systems.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/LNTBuilder.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=204382&r1=204381&r2=204382&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Mar 20 14:29:41 2014
@@ -590,6 +590,7 @@ def _get_polly_builders():
                                                     nt_flags=['--multisample=10'],
                                                     reportBuildslave=False,
                                                     package_cache="http://parkas1.inria.fr/packages",
+                                                    submitURL='http://llvm.org/perf/submitRun',
                                                     testerName='pollyperf-O3')},
         {'name': "polly-perf-O3-polly",
          'slavenames':["pollyperf6"],
@@ -598,6 +599,7 @@ def _get_polly_builders():
                                                     nt_flags=['--multisample=10', '--mllvm=-polly'],
                                                     reportBuildslave=False,
                                                     package_cache="http://parkas1.inria.fr/packages",
+                                                    submitURL='http://llvm.org/perf/submitRun',
                                                     testerName='pollyperf-O3-polly')},
         {'name': "polly-perf-O3-polly-codegen-isl",
          'slavenames':["pollyperf7"],
@@ -606,6 +608,7 @@ def _get_polly_builders():
                                                     nt_flags=['--multisample=10', '--mllvm=-polly', '--mllvm=-polly-code-generator=isl'],
                                                     reportBuildslave=False,
                                                     package_cache="http://parkas1.inria.fr/packages",
+                                                    submitURL='http://llvm.org/perf/submitRun',
                                                     testerName='pollyperf-O3-polly-codegen-isl')},
         {'name': "polly-perf-O3-polly-scev",
          'slavenames':["pollyperf10"],
@@ -614,6 +617,7 @@ def _get_polly_builders():
                                                     nt_flags=['--multisample=10', '--mllvm=-polly', '--mllvm=-polly-codegen-scev'],
                                                     reportBuildslave=False,
                                                     package_cache="http://parkas1.inria.fr/packages",
+                                                    submitURL='http://llvm.org/perf/submitRun',
                                                     testerName='pollyperf-O3-polly-scev')},
         {'name': "polly-perf-O3-polly-scev-codegen-isl",
          'slavenames':["pollyperf11"],
@@ -622,6 +626,7 @@ def _get_polly_builders():
                                                     nt_flags=['--multisample=10', '--mllvm=-polly', '--mllvm=-polly-code-generator=isl', '--mllvm=-polly-codegen-scev'],
                                                     reportBuildslave=False,
                                                     package_cache="http://parkas1.inria.fr/packages",
+                                                    submitURL='http://llvm.org/perf/submitRun',
                                                     testerName='pollyperf-O3-polly-scev-codegen-isl')},
         {'name': "polly-perf-O3-polly-detect",
          'slavenames':["pollyperf14"],
@@ -630,6 +635,7 @@ def _get_polly_builders():
                                                     nt_flags=['--multisample=10', '--mllvm=-polly', '--mllvm=-polly-code-generator=none', '--mllvm=-polly-optimizer=none'],
                                                     reportBuildslave=False,
                                                     package_cache="http://parkas1.inria.fr/packages",
+                                                    submitURL='http://llvm.org/perf/submitRun',
                                                     testerName='pollyperf-O3-polly-detect')}
        ]
 

Modified: zorg/trunk/zorg/buildbot/builders/LNTBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LNTBuilder.py?rev=204382&r1=204381&r2=204382&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LNTBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LNTBuilder.py Thu Mar 20 14:29:41 2014
@@ -71,7 +71,7 @@ def AddLNTTestsToFactory(f, nt_flags, cc
 
     parallel = kwargs.pop('parallel', False)
     jobs = kwargs.pop('jobs', '$(jobs)s')
-    submitURL = kwargs.pop('submitURL', 'http://llvm.org/perf/submitRun')
+    submitURL = kwargs.pop('submitURL', None)
     package_cache = kwargs.pop('package_cache', 'http://lab.llvm.org/packages')
     testerName = kwargs.pop('testerName', None)
     reportBuildslave = kwargs.pop('reportBuildslave', True)
@@ -142,15 +142,19 @@ def AddLNTTestsToFactory(f, nt_flags, cc
     # Run the nightly test.
     args = [WithProperties('%(builddir)s/lnt.venv/bin/python'),
             WithProperties('%(builddir)s/lnt.venv/bin/lnt'),
-            'runtest', '--verbose',
-            '--submit', submitURL,
-            '--commit=1',
-            'nt', '--sandbox', 'nt',
-            '--no-timestamp',
-            '--cc', cc_path, '--cxx', cxx_path,
-            '--without-llvm',
-            '--test-suite', WithProperties('%(builddir)s/test-suite'), 
-            '--no-machdep-info', reportName]
+            'runtest', '--verbose']
+
+    # Only submit if a URL has been specified
+    if submitURL is not None:
+      args += ['--submit', submitURL]
+
+    args += ['--commit=1',
+             'nt', '--sandbox', 'nt',
+             '--no-timestamp',
+             '--cc', cc_path, '--cxx', cxx_path,
+             '--without-llvm',
+             '--test-suite', WithProperties('%(builddir)s/test-suite'), 
+             '--no-machdep-info', reportName]
     if parallel:
         args.extend(['-j', WithProperties(jobs)])
     args.extend(nt_flags)