diff --git a/buildbot/master.cfg b/buildbot/master.cfg index f57a176..07b8141 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -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=['']) diff --git a/docker/Dockerfile.f29 b/docker/Dockerfile.f29 new file mode 100644 index 0000000..5a3ab77 --- /dev/null +++ b/docker/Dockerfile.f29 @@ -0,0 +1,27 @@ +# vi:syntax=dockerfile +FROM registry.fedoraproject.org/fedora:29 +MAINTAINER Daniele ViganĂ² + +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Ă² " > 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"]