disable coveralls.io

m-labs · Feb 15, 2018 · 143a66d · 143a66d
1 parent b894f62
commit 143a66d
Showing 3 changed files with 10 additions and 78 deletions.
diff --git a/master.cfg b/master.cfg
@@ -89,7 +89,7 @@ from buildbot.steps.master import MasterShellCommand
 from buildbot.steps.transfer import DirectoryUpload, StringDownload
 from buildbot.steps.trigger import Trigger
 from buildbot.process.properties import renderer
-from steps import LitTestCommand, CoverallsCommand, XilinxCommand
+from steps import LitTestCommand, XilinxCommand
 from steps import SleepStep, FlockStep, FunlockStep
 
 conda_lock = locks.SlaveLock('conda', maxCount=1)
@@ -255,30 +255,14 @@ def addCondaTeardownTestEnvironmentSteps(factory):
                                 [conda_lock.access('exclusive')]))
 
 def addPythonUnittestSteps(factory, locks=default_locks,
-                           extra_vars={}, test_path='.'):
+                           extra_vars={}, test_path='.', warn_only=False):
     factory.addStep(
         ShellCommand(
             name              = 'python_unittest',
             command           = ['python', '-m', 'unittest', 'discover', '-v', test_path],
             description       = 'testing',
             descriptionDone   = 'test',
             descriptionSuffix = test_path if test_path != "." else "",
-            haltOnFailure     = True,
-            env               = condaEnv(use_local=True,
-                                         extra_vars=extra_vars),
-            locks             = locks))
-
-def addPythonCoverageSteps(factory, source_path, locks=default_locks,
-                           extra_vars={}, test_path='.', warn_only=False):
-    factory.addStep(
-        ShellCommand(
-            name              = 'python_coverage',
-            command           = ['coverage', 'run', '--parallel-mode',
-                                 '--source', source_path,
-                                 '-m', 'unittest', 'discover', '-v', test_path],
-            description       = 'testing',
-            descriptionDone   = 'test',
-            descriptionSuffix = test_path if test_path != "." else "",
             haltOnFailure     = not warn_only,
             flunkOnFailure    = not warn_only,
             warnOnFailure     = warn_only,
@@ -365,41 +349,6 @@ def addSFTPUploadSteps(factory, source_path, target_host,
             target_path       = target_path,
             locks             = default_locks))
 
-def addPythonCoverageCombineSteps(factory):
-    factory.addStep(
-        ShellCommand(
-            name              = 'coverage_combine',
-            command           = 'coverage combine',
-            description       = 'combining',
-            descriptionDone   = 'combine',
-            descriptionSuffix = 'coverage',
-            env               = condaEnv(use_local=True),
-            locks             = default_locks))
-
-def addCoverallsUploadSteps(factory, repo_token):
-    factory.addStep(
-        StringDownload(
-            name              = 'coveralls_configure',
-            description       = 'configuring',
-            descriptionDone   = 'configure',
-            descriptionSuffix = 'coveralls',
-            s                 = WithProperties('service_job_id: "%(got_revision)s"'),
-            slavedest         = '.coveralls.yml',
-            locks             = default_locks))
-
-    factory.addStep(
-        CoverallsCommand(
-            name              = 'coveralls_upload',
-            description       = 'uploading',
-            descriptionDone   = 'upload',
-            descriptionSuffix = 'coveralls',
-            flunkOnFailure    = False,
-            warnOnFailure     = True,
-            env               = condaEnv(extra_vars={
-                'COVERALLS_REPO_TOKEN': repo_token
-            }),
-            locks             = default_locks))
-
 def addARTIQFlashSteps(factory, board, domain, options=[]):
     address = '{}.{}'.format(board, domain)
     options = ['-I', 'source /var/lib/artiq/boards/{}'.format(board)] + options
@@ -567,11 +516,11 @@ addCondaSetupTestEnvironmentSteps(artiqBuildFactory,
     packages=['artiq=%(output_version)s', 'artiq-dev=%(output_version)s'])
 addPythonUnittestSteps(artiqBuildFactory,
     test_path='artiq/gateware/test')
-addPythonCoverageSteps(artiqBuildFactory,
-    source_path='artiq', test_path='artiq/test')
+addPythonUnittestSteps(artiqBuildFactory,
+    test_path='artiq/test')
 addLitSteps(artiqBuildFactory,
     test_path='artiq/test/lit',
-    extra_vars={ 'COVERAGE': '1', 'PYTHONPATH': '.' })
+    extra_vars={ 'PYTHONPATH': '.' })
 # Upload the `artiq` package
 addCondaUploadSteps(artiqBuildFactory,
     force=True, label='dev')
@@ -590,13 +539,10 @@ addFlockAcquireSteps(artiqBuildFactory,
 addARTIQFlashSteps(artiqBuildFactory,
     board=test_board,
     domain='lab.m-labs.hk')
-addPythonCoverageSteps(artiqBuildFactory,
-    source_path='artiq', test_path='artiq/test/coredevice',
+addPythonUnittestSteps(artiqBuildFactory,
+    test_path='artiq/test/coredevice',
     locks=[low_latency_lock.access('exclusive')],
     extra_vars={ 'ARTIQ_LOW_LATENCY': '1', 'ARTIQ_ROOT': 'artiq/examples/master' })
-addPythonCoverageCombineSteps(artiqBuildFactory)
-addCoverallsUploadSteps(artiqBuildFactory,
-    repo_token=secrets['coveralls']['artiq'])
 # Test ARTIQ on Windows with hardware in the loop
 addTriggerSteps(artiqBuildFactory,
     builder_names=['artiq-win64-test'],
@@ -683,15 +629,12 @@ artiqWin64TestBuildFactory = BuildFactory()
 addUpdateSteps(artiqWin64TestBuildFactory,
     project='artiq')
 addCondaSetupTestEnvironmentSteps(artiqWin64TestBuildFactory,
-    packages=['%(package)s', 'coverage'])
-addPythonCoverageSteps(artiqWin64TestBuildFactory,
-    source_path='artiq', test_path='artiq/test',
+    packages=['%(package)s'])
+addPythonUnittestSteps(artiqWin64TestBuildFactory,
+    source_path='artiq',
     locks=[low_latency_lock.access('exclusive')],
     extra_vars={ 'ARTIQ_LOW_LATENCY': '1', 'ARTIQ_ROOT': 'artiq\\examples\\master' },
     warn_only=True)
-addPythonCoverageCombineSteps(artiqWin64TestBuildFactory)
-addCoverallsUploadSteps(artiqWin64TestBuildFactory,
-    repo_token=secrets['coveralls']['artiq'])
 addCondaTeardownTestEnvironmentSteps(artiqWin64TestBuildFactory)
 
 c['builders'].append(

diff --git a/steps/__init__.py b/steps/__init__.py
@@ -1,5 +1,4 @@
 from .lit_test import LitTestCommand
-from .coveralls import CoverallsCommand
 from .xilinx import XilinxCommand
 from .sleep import SleepStep
 from .flock import FlockStep, FunlockStep
diff --git a/steps/coveralls.py b/steps/coveralls.py