From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A743F158086 for ; Thu, 28 Oct 2021 21:07:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E313E08CD; Thu, 28 Oct 2021 21:07:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D82F2E08CD for ; Thu, 28 Oct 2021 21:07:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE4523439C1 for ; Thu, 28 Oct 2021 21:07:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E470162 for ; Thu, 28 Oct 2021 21:07:04 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1635455267.fb8fd7f92f69ebd16a9164ddd8a8328c7c6a7f16.zorry@gentoo> Subject: [gentoo-commits] proj/tinderbox-cluster:master commit in: / X-VCS-Repository: proj/tinderbox-cluster X-VCS-Files: gentooci.cfg master.cfg X-VCS-Directories: / X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: fb8fd7f92f69ebd16a9164ddd8a8328c7c6a7f16 X-VCS-Branch: master Date: Thu, 28 Oct 2021 21:07:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c9488682-e606-4eef-a305-25d52dfb9542 X-Archives-Hash: b6bf98db0a29095defe943fe80101704 commit: fb8fd7f92f69ebd16a9164ddd8a8328c7c6a7f16 Author: Magnus Granberg gentoo org> AuthorDate: Thu Oct 28 21:07:47 2021 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Thu Oct 28 21:07:47 2021 +0000 URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=fb8fd7f9 Update the cfg files (worker_data, project) Signed-off-by: Magnus Granberg gentoo.org> gentooci.cfg | 26 +++++++++++++++++++++++--- master.cfg | 42 ++++++++++++++++++++++++++++++++---------- 2 files changed, 55 insertions(+), 13 deletions(-) diff --git a/gentooci.cfg b/gentooci.cfg index 4043db4..3701878 100644 --- a/gentooci.cfg +++ b/gentooci.cfg @@ -13,10 +13,30 @@ c = BuildmasterConfig = {} # It's easy to start with sqlite, but it's recommended to switch to a dedicated # database, such as PostgreSQL or MySQL, for use in production environments. # http://docs.buildbot.net/current/manual/configuration/global.html#database-specification -c['db_url'] = "mysql://buildbot:xxxx@192.168.1.x/gentooci?max_idle=300" +c['db_url'] = "postgresql://buildbot:password@ip/gentoo-ci" + +makeconf_list = [] +makeconf_list.append('LC_MESSAGES=C') +makeconf_list.append('NOCOLOR="true"') +makeconf_list.append('GCC_COLORS=""') +makeconf_list.append('PORTAGE_TMPFS="/dev/shm"') +makeconf_list.append('CLEAN_DELAY=0') +makeconf_list.append('NOCOLOR=true') +makeconf_list.append('PORT_LOGDIR="/var/cache/portage/logs"') +makeconf_list.append('PKGDIR="/var/cache/portage/packages"') +makeconf_list.append('DISTDIR="/var/cache/portage/distfiles"') +makeconf_list.append('PORTAGE_ELOG_CLASSES="*"') +# We need echo:info to get the logfile name +makeconf_list.append('PORTAGE_ELOG_SYSTEM="save:* echo:info"') +# use ansifilter on the logs +makeconf_list.append('PORTAGE_LOG_FILTER_FILE_CMD="bash -c \'ansifilter --ignore-clear; exec cat\'"') # This specifies what project buildbot uses for Gentoo Ci as default -c['project'] = "gosbsbase" +c['project'] = { + 'update_db' : 'gosbsbase', + 'worker_portage_repos_path' : '/var/db/repos/', + 'config_makeconfig' : makeconf_list, +} # This specifies what the repository base dir is -c['repository_basedir'] = "/srv/repository" +c['repository_basedir'] = "repositorys" diff --git a/master.cfg b/master.cfg index 464d54d..47555ce 100644 --- a/master.cfg +++ b/master.cfg @@ -1,20 +1,33 @@ # -*- python -*- # ex: set filetype=python: -from buildbot_gentoo_ci.config import schedulers, workers, builders, service +from buildbot.plugins import util +from buildbot_gentoo_ci.config import schedulers, workers, builders, service, change_source, reporters # This is a sample buildmaster config file. It must be installed as # 'master.cfg' in your buildmaster's base directory. +#FIXME: Get workers from db or a file +worker_data = [ + {'uuid' : 'uuid', 'password' : '', 'type' : 'local', 'enable' : True, }, + {'uuid' : 'uuid', 'password' : '', 'type' : 'local', 'enable' : True, }, + {'uuid' : 'uuid', 'password' : '', 'type' : 'local', 'enable' : True, }, + {'uuid' : 'uuid', 'password' : '', 'type' : 'local', 'enable' : True, }, + {'uuid' : 'uuid', 'password' : 'password', 'type' : 'default', 'enable' : True, }, + {'uuid' : 'uuid', 'password' : 'password', 'type' : 'default', 'enable' : True, }, +] + # This is the dictionary that the buildmaster pays attention to. We also use # a shorter alias to save typing. c = BuildmasterConfig = {} +c['buildbotNetUsageData'] = None + ####### WORKERS # The 'workers' list defines the set of recognized workers. Each element is # a Worker object, specifying a unique worker name and password. The same # worker name and password must be configured on the worker. -c['workers'] = workers.gentoo_workers() +c['workers'] = workers.gentoo_workers(worker_data) # 'protocols' contains information about protocols which master will use for # communicating with workers. You must define at least 'port' option that workers @@ -28,7 +41,7 @@ c['protocols'] = {'pb': {'port': 9989}} # the 'change_source' setting tells the buildmaster how it should find out # about source code changes. Here we point to the buildbot version of a python hello-world project. -# c['change_source'] = [] +c['change_source'] = change_source.gentoo_change_source() ####### SCHEDULERS @@ -43,7 +56,7 @@ c['schedulers'] = schedulers.gentoo_schedulers() # what steps, and which workers can execute them. Note that any particular build will # only take place on one worker. -c['builders'] = builders.gentoo_builders() +c['builders'] = builders.gentoo_builders(worker_data) ####### BUILDBOT SERVICES @@ -51,9 +64,9 @@ c['builders'] = builders.gentoo_builders() # status of each build will be pushed to these targets. buildbot/reporters/*.py # has a variety to choose from, like IRC bots. -c['services'] = [ - service.GentooCiService(basedir) -] +c['services'] = [] +c['services'].append(service.GentooCiService(basedir)) +c['services'] = reporters.gentoo_reporters(r=c['services']) ####### PROJECT IDENTITY @@ -71,12 +84,21 @@ c['titleURL'] = "https://gentoo-ci.gentoo.org" c['buildbotURL'] = "http://localhost:8010/" # minimalistic config to activate new web UI -c['www'] = dict(port=8010, - plugins=dict(waterfall_view={}, console_view={}, grid_view={})) +c['www'] = dict(port=8010, plugins=dict(waterfall_view={}, console_view={}, grid_view={})) + +c['www']['ui_default_config'] = { + 'Waterfall.lazy_limit_waterfall': 408, + 'Console.buildLimit': 1000, + 'Console.changeLimit': 150, + 'Grid.revisionLimit': 30, + 'BuildRequests.buildrequestFetchLimit': 100, + 'ChangeBuilds.buildsFetchLimit': 150, + 'Changes.changesFetchLimit': 150, +} ####### DB URL # This specifies what database buildbot uses to store its state. # It's easy to start with sqlite, but it's recommended to switch to a dedicated # database, such as PostgreSQL or MySQL, for use in production environments. # http://docs.buildbot.net/current/manual/configuration/global.html#database-specification -c['db_url'] = "mysql://buildbot:xxx@192.168.1.x/buildbot?max_idle=300" +c['db_url'] = "postgresql://buildbot:password@ip/buildbot"