This commit is contained in:
Daniele Viganò 2018-10-24 10:41:20 +02:00
parent f8cd71d680
commit 7672102f8b
Signed by: dani
GPG Key ID: DB49AFC03C40EE02
2 changed files with 39 additions and 1 deletions

View File

@ -27,6 +27,10 @@ c['workers'] = [
docker_host='unix:///var/run/docker.sock',
image='buildbot-worker:28',
hostconfig={'cap_add': ['SYS_ADMIN'], 'security_opt': ['apparmor=unconfined']}),
worker.DockerLatentWorker('f29', 'work3rP@ss!',
docker_host='unix:///var/run/docker.sock',
image='buildbot-worker:29',
hostconfig={'cap_add': ['SYS_ADMIN'], 'security_opt': ['apparmor=unconfined']}),
]
# 'protocols' contains information about protocols which master will use for
# communicating with workers. You must define at least 'port' option that workers
@ -68,6 +72,9 @@ c['schedulers'].append(schedulers.ForceScheduler(
c['schedulers'].append(schedulers.ForceScheduler(
name="Force_QGIS_DNF_F28",
builderNames=["qgis_dnf_f28"]))
c['schedulers'].append(schedulers.ForceScheduler(
name="Force_QGIS_DNF_F29",
builderNames=["qgis_dnf_f29"]))
####### BUILDERS
@ -105,6 +112,10 @@ c['builders'].append(
util.BuilderConfig(name="qgis",
workernames=["f28"],
factory=qgis_factory))
c['builders'].append(
util.BuilderConfig(name="qgis_dnf_f29",
workernames=["f29"],
factory=qgis_install_factory))
c['builders'].append(
util.BuilderConfig(name="qgis_dnf_f28",
workernames=["f28"],
@ -145,7 +156,7 @@ c['www']['authz'] = util.Authz(
allowRules = [
util.AnyControlEndpointMatcher(role="admins", defaultDeny=True),
util.AnyEndpointMatcher(role="admins", defaultDeny=False),
# if future Buildbot implement new control, we are safe with this last rule
# if future Buildbot implement new control, we are safe with this last rule
],
roleMatchers = [
util.RolesFromUsername(roles=['admins'], usernames=['<user>'])

27
docker/Dockerfile.f29 Normal file
View File

@ -0,0 +1,27 @@
# vi:syntax=dockerfile
FROM registry.fedoraproject.org/fedora:29
MAINTAINER Daniele Viganò <daniele@vigano.me>
RUN dnf install -y sudo findutils tar bzip2 git python3-pip mock copr-cli && \
dnf clean all && \
find /var/cache/dnf -type f -delete
# Use a Twisted binary wheel to avoid too many dependencies
RUN pip3 install https://daniele.vigano.me/files/pypi/Twisted-17.9.0-cp36-cp36m-manylinux1_x86_64.whl \
buildbot-worker==1.2.0
RUN useradd -u 1000 builder && \
usermod -a -G mock builder
RUN echo "builder ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
USER builder
ENV HOME /home/builder
WORKDIR ${HOME}
RUN buildbot-worker create-worker $HOME 172.17.0.1 f29 work3rP@ss! && \
echo "Daniele Viganò <daniel@vigano.me>" > info/admin && \
echo "Docker running Fedora 28 (x86_64)" > info/host
COPY copr $HOME/.config/copr
ENTRYPOINT ["/usr/local/bin/buildbot-worker"]
CMD ["start", "--nodaemon"]