diff options
author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-02-16 13:53:54 +0100 |
---|---|---|
committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-02-16 13:53:54 +0100 |
commit | c334380e6228ebbdc6ef35a05171892b100ff628 (patch) | |
tree | 0ee5a2fe56504aa57a964b2166a44f235362a711 /buildbot | |
parent | 6e020325b58887b8e36b0922826562b078d25d0e (diff) | |
download | deployment-c334380e6228ebbdc6ef35a05171892b100ff628.tar.gz deployment-c334380e6228ebbdc6ef35a05171892b100ff628.tar.bz2 deployment-c334380e6228ebbdc6ef35a05171892b100ff628.zip |
Polishing Buildbot master.
Diffstat (limited to 'buildbot')
-rw-r--r-- | buildbot/master.cfg (renamed from buildbot/master-lonelyslave.cfg) | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/buildbot/master-lonelyslave.cfg b/buildbot/master.cfg index fd82b97..6e8b657 100644 --- a/buildbot/master-lonelyslave.cfg +++ b/buildbot/master.cfg @@ -14,8 +14,7 @@ c['buildCacheSize'] = 2 ####### BUILDSLAVES from buildbot.worker import Worker -c['workers'] = [Worker("lonelySlave", "taler"), - Worker("lcovSlave", "taler"), +c['workers'] = [Worker("lcovSlave", "taler"), Worker("containersSlave", "taler")] c['protocols'] = {'pb': {'port': 9989}} @@ -23,7 +22,6 @@ c['protocols'] = {'pb': {'port': 9989}} ####### CHANGESOURCES # They are just "pointers" to monitored codebases. - from buildbot.changes.gitpoller import GitPoller c['change_source'] = [] c['change_source'].append(GitPoller( @@ -56,10 +54,10 @@ gitMaster = SingleBranchScheduler( reason="Commit pushed for one of the sub-projects", change_filter=filter.ChangeFilter(branch='master'), treeStableTimer=300, - builderNames=["lone-builder", "lcov-build", "auto-click"]) + builderNames=["lcov-build", "auto-click"]) force = ForceScheduler(name="force-build", - builderNames=["lone-builder", "lcov-build", "auto-click"]) + builderNames=["lcov-build", "auto-click"]) c['schedulers'] = [force, gitMaster] @@ -73,25 +71,6 @@ from buildbot.steps.shell import Compile from buildbot.steps.shell import Test import os -lonelyness = BuildFactory() -lonelyness.addStep(Git(repourl='git://git.taler.net/deployment.git', - mode='full', - method='fresh', - alwaysUseLatest=True, - haltOnFailure=True, - branch='master')) -lonelyness.addStep(ShellCommand(name="invalidation", - description="Invalidating timestamps", - descriptionDone="timestamps invalidated", - command=["./invalidate.sh"], - workdir="build/taler-build")) -lonelyness.addStep(ShellCommand(name="builder", - description="Lone compilation..", - descriptionDone="Compilation passed", - command=["make"], - workdir="build/taler-build", - env={'PATH': "${HOME}/local/bin:${PATH}", - 'TALER_CHECKDB' : "postgresql:///talercheck?host=/home/${USER}/sockets"})) lcov = BuildFactory() lcov.addStep(Git(repourl='git://git.taler.net/deployment.git', mode='full', @@ -123,10 +102,6 @@ from buildbot.config import BuilderConfig c['builders'] = [] c['builders'].append( - BuilderConfig(name="lone-builder", - workernames=["lonelySlave"], - factory=lonelyness)) -c['builders'].append( BuilderConfig(name="lcov-build", workernames=["lcovSlave"], factory=lcov)) |