diff --git a/master.cfg b/master.cfg index dee188a..d17df98 100644 --- a/master.cfg +++ b/master.cfg @@ -43,7 +43,7 @@ c['protocols'] = {'pb': {'port': os.environ.get("BUILDBOT_WORKER_PORT", 9989)}} c['change_source'] = [] c['change_source'].append(changes.GitPoller( - 'git://gitea.parrrate.ru/PTV/radn-rs.git', + 'https://gitea.parrrate.ru/PTV/radn-rs.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)) @@ -71,6 +71,7 @@ c['schedulers'].append(schedulers.ForceScheduler( factory = util.BuildFactory() # check out the source factory.addStep(steps.Git(repourl='https://gitea.parrrate.ru/PTV/radn-rs.git', mode='incremental')) +# factory.addStep(steps.Gitea(repourl='https://gitea.parrrate.ru/PTV/radn-rs.git', mode='incremental')) # run the tests (note that this will require that 'trial' is installed) factory.addStep(steps.ShellCommand(command=["cargo", "test"])) @@ -86,7 +87,9 @@ c['builders'].append( # pushed to these targets. buildbot/reporters/*.py has a variety to choose from, # like IRC bots. -c['services'] = [] +c['services'] = [ + # reporters.GiteaStatusPush('https://example.com', "SECRET", verbose=True), +] ####### PROJECT IDENTITY @@ -106,6 +109,19 @@ c['buildbotURL'] = os.environ.get("BUILDBOT_WEB_URL", "http://localhost:8010/") # minimalistic config to activate new web UI c['www'] = dict(port=os.environ.get("BUILDBOT_WEB_PORT", 8010), plugins=dict(waterfall_view={}, console_view={})) +c['www'] = { + 'port': os.environ.get("BUILDBOT_WEB_PORT", 8010), + 'plugins': { + 'waterfall_view': {}, + 'console_view': {}, + }, + # 'change_hook_dialects': { + # 'gitea': { + # 'secret': '', + # 'onlyIncludePushCommit': True, + # } + # }, +} ####### DB URL diff --git a/master/Dockerfile b/master/Dockerfile new file mode 100644 index 0000000..19bcb5e --- /dev/null +++ b/master/Dockerfile @@ -0,0 +1,2 @@ +FROM buildbot/buildbot-master:master +RUN pip3 install buildbot_gitea diff --git a/simple/docker-compose.yml b/simple/docker-compose.yml index dc28a3e..e0c8af5 100644 --- a/simple/docker-compose.yml +++ b/simple/docker-compose.yml @@ -1,7 +1,8 @@ version: '2' services: buildbot: - image: buildbot/buildbot-master:master + image: "buildbot-master-parrrate" + build: ../master env_file: - db.env environment: @@ -24,7 +25,7 @@ services: - 5432 worker: - image: "buildbot-worker-rust" + image: "buildbot-worker-parrrate-rust" build: ../worker environment: BUILDMASTER: buildbot