Skip to content

Commit

Permalink
Move master-docker-nonstandard to use common master setup
Browse files Browse the repository at this point in the history
  • Loading branch information
@cvicentiu
cvicentiu committed Dec 3, 2024
1 parent f1ded0e commit ef6df0c
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 98 deletions.
149 changes: 52 additions & 97 deletions master-docker-nonstandard/master.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,86 +1,63 @@
# -*- python -*-
# ex: set filetype=python:

from buildbot.plugins import *
from buildbot.process.properties import Property, Properties
from buildbot.steps.shell import ShellCommand, Compile, Test, SetPropertyFromCommand
from buildbot.steps.mtrlogobserver import MTR, MtrLogObserver
from buildbot.steps.source.github import GitHub
from buildbot.process.remotecommand import RemoteCommand
from datetime import timedelta
from twisted.internet import defer

import docker
import os
import sys
from collections import defaultdict

sys.path.insert(0, "/srv/buildbot/master")
sys.setrecursionlimit(10000)

from common_factories import *
from constants import *
from locks import *
from schedulers_definition import SCHEDULERS
from utils import *
import docker
from buildbot.plugins import steps, util, worker
from buildbot.process.properties import Property
from common_factories import (
addTests,
getHTMLLogString,
getQuickBuildFactory,
getRpmAutobakeFactory,
getSourceTarball,
)
from constants import MTR_ENV
from locks import getLocks
from master_common import base_master_config
from utils import (
canStartBuild,
createVar,
createWorker,
dockerfile,
filterBranch,
hasAutobake,
hasBigtest,
hasEco,
hasFailed,
moveMTRLogs,
mtrJobsMultiplier,
nextBuild,
printEnv,
saveLogs,
savePackage,
)

FQDN = os.getenv("BUILDMASTER_WG_IP", default="100.64.100.1")

# This is the dictionary that the buildmaster pays attention to. We also use
# a shorter alias to save typing.
c = BuildmasterConfig = {}

# Load the slave, database passwords and 3rd-party tokens from an external private file, so
# that the rest of the configuration can be public.
# Load the slave, database passwords and 3rd-party tokens from an external
# private file, so that the rest of the configuration can be public.
config = {"private": {}}
exec(open("master-private.cfg").read(), config, {})

####### BUILDBOT SERVICES

# 'services' is a list of BuildbotService items like reporter targets. The
# status of each build will be pushed to these targets. buildbot/reporters/*.py
# has a variety to choose from, like IRC bots.


c["services"] = []
context = util.Interpolate("buildbot/%(prop:buildername)s")
gs = reporters.GitHubStatusPush(
token=config["private"]["gh_mdbci"]["access_token"],
context=context,
startDescription="Build started.",
endDescription="Build done.",
verbose=True,
builders=GITHUB_STATUS_BUILDERS,
)
c["services"].append(gs)
c['secretsProviders'] = [secrets.SecretInAFile(dirname=os.getenv("MASTER_CREDENTIALS_DIR", default="/srv/buildbot/master/master-credential-provider"))]
####### PROJECT IDENTITY

# the 'title' string will appear at the top of this buildbot installation's
# home pages (linked to the 'titleURL').
c["title"] = os.getenv("TITLE", default="MariaDB CI")
c["titleURL"] = os.getenv("TITLE_URL", default="https://github.com/MariaDB/server")

# the 'buildbotURL' string should point to the location where the buildbot's
# internal web server is visible. This typically uses the port number set in
# the 'www' entry below, but with an externally-visible host name which the
# buildbot cannot figure out without some help.
c["buildbotURL"] = os.getenv("BUILDMASTER_URL", default="https://buildbot.mariadb.org/")

# 'protocols' contains information about protocols which master will use for
# communicating with workers. You must define at least 'port' option that workers
# could connect to your master with this protocol.
# 'port' must match the value configured into the workers (with their
# --master option)
port = int(os.getenv("PORT", default="9992"))
c["protocols"] = {"pb": {"port": port}}

####### DB URL

c["db"] = {
# This specifies what database buildbot uses to store its state.
"db_url": config["private"]["db_url"]
}
# This is the dictionary that the buildmaster pays attention to. We also use
# a shorter alias to save typing.
c = BuildmasterConfig = base_master_config(
title=os.getenv("TITLE", default="MariaDB CI"),
title_url=os.getenv("TITLE_URL",
default="https://github.com/MariaDB/server"),
buildbot_url=os.getenv("BUILDMASTER_URL",
default="https://buildbot.mariadb.org/"),
github_access_token=config["private"]["gh_mdbci"]["access_token"],
# TODO(cvicentiu) undo this hardcoding
secrets_provider_file=os.getenv("MASTER_CREDENTIALS_DIR",
default="/srv/buildbot/master/master-credential-provider"),
master_port=int(os.getenv("PORT", default="9992")),
db_url=config["private"]["db_url"],
mq_router_url=os.getenv("MQ_ROUTER_URL", default="ws://localhost:8085/ws"))


mtrDbPool = util.EqConnectionPool(
"MySQLdb",
Expand All @@ -90,14 +67,6 @@ mtrDbPool = util.EqConnectionPool(
config["private"]["db_mtr_db"],
)

####### Disable net usage reports from being sent to buildbot.net
c["buildbotNetUsageData"] = None

####### SCHEDULERS

# Configure the Schedulers, which decide how to react to incoming changes.
c["schedulers"] = SCHEDULERS

####### WORKERS

# The 'workers' list defines the set of recognized workers. Each element is
Expand Down Expand Up @@ -132,8 +101,6 @@ def addWorker(


# Docker workers
fqdn = os.getenv("BUILDMASTER_WG_IP", default="100.64.100.1")

## hz-bbw2-docker
c["workers"].append(
worker.DockerLatentWorker(
Expand All @@ -142,7 +109,7 @@ c["workers"].append(
docker_host=config["private"]["docker_workers"]["hz-bbw2-docker"],
dockerfile=open("dockerfiles/eco-php-ubuntu-2004.dockerfile").read(),
followStartupLogs=False,
masterFQDN=fqdn,
masterFQDN=FQDN,
hostconfig={
"shm_size": "6G",
"ulimits": [
Expand All @@ -165,7 +132,7 @@ c["workers"].append(
"dockerfiles/eco-pymysql-python-3-9-slim-buster.dockerfile"
).read(),
followStartupLogs=False,
masterFQDN=fqdn,
masterFQDN=FQDN,
hostconfig={
"shm_size": "6G",
"ulimits": [
Expand All @@ -186,7 +153,7 @@ c["workers"].append(
docker_host=config["private"]["docker_workers"]["hz-bbw2-docker"],
dockerfile=open("dockerfiles/eco-mysqljs-nodejs15-buster.dockerfile").read(),
followStartupLogs=False,
masterFQDN=fqdn,
masterFQDN=FQDN,
hostconfig={
"shm_size": "6G",
"ulimits": [
Expand All @@ -213,7 +180,7 @@ c["workers"].append(
followStartupLogs=False,
autopull=True,
alwaysPull=True,
masterFQDN=fqdn,
masterFQDN=FQDN,
hostconfig={
"shm_size": "20G",
"ulimits": [
Expand Down Expand Up @@ -1758,15 +1725,3 @@ c["builders"].append(
factory=f_prep_local,
)
)

c["logEncoding"] = "utf-8"

c["multiMaster"] = True

c["mq"] = { # Need to enable multimaster aware mq. Wamp is the only option for now.
"type": "wamp",
"router_url": os.getenv("MQ_ROUTER_URL", default="ws://localhost:8085/ws"),
"realm": "realm1",
# valid are: none, critical, error, warn, info, debug, trace
"wamp_debug_level": "info",
}
2 changes: 1 addition & 1 deletion master.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ c = BuildmasterConfig = base_master_config(
github_access_token=config["private"]["gh_mdbci"]["access_token"],
# TODO(cvicentiu) undo this hardcoding
secrets_provider_file="/srv/buildbot/master/master-credential-provider",
master_port=os.getenv("PORT", default=master_config["port"]),
master_port=int(os.getenv("PORT", default=master_config["port"])),
db_url=config["private"]["db_url"],
mq_router_url=os.getenv("MQ_ROUTER_URL", default="ws://localhost:8085/ws"))

Expand Down

0 comments on commit ef6df0c

Please sign in to comment.