diff --git a/buildbot/master.cfg b/buildbot/master.cfg index a6c1be2..1846b3a 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -57,6 +57,9 @@ c['schedulers'] = [] c['schedulers'].append(schedulers.ForceScheduler( name="Force_QGIS", builderNames=["qgis"])) +c['schedulers'].append(schedulers.ForceScheduler( + name="Force_QGIS_DNF", + builderNames=["qgis_dnf"])) ####### BUILDERS @@ -76,7 +79,16 @@ qgis_factory.addStep(steps.ShellCommand(command="ls", workdir="build/rpm/result" qgis_factory.addStep(steps.SetPropertyFromCommand(command="ls qgis*.src.rpm", property="srpm", workdir="build/rpm/result", name="Get artifacts")) qgis_factory.addStep(steps.ShellCommand(command=["copr-cli", "build", "qgis-testing", util.Interpolate("%(prop:srpm)s")], - workdir="build/rpm/result", timeout=10800, name="Build on COPR")) + workdir="build/rpm/result", timeout=28800, name="Build on COPR")) + +qgis_install_factory = util.BuildFactory() +qgis_install_factory.addStep(steps.ShellCommand(command=["/usr/bin/sudo", "dnf", "copr", "enable", "-y", "dani/qgis-testing"], + name="[F26] Add COPR")) +qgis_install_factory.addStep(steps.ShellCommand(command=["/usr/bin/sudo", "dnf", "install", "--refresh", "-y", "qgis", + "python3-qgis", "qgis-server", "qgis-grass"], + name="[F26] Run DNF")) +qgis_install_factory.addStep(steps.ShellCommand(command=["/usr/bin/qgis", "--help"], + name="[F26] Run QGIS")) # th_factory = util.BuildFactory() # dummy @@ -85,6 +97,10 @@ c['builders'].append( util.BuilderConfig(name="qgis", workernames=["docker"], factory=qgis_factory)) +c['builders'].append( + util.BuilderConfig(name="qgis_dnf", + workernames=["docker"], + factory=qgis_install_factory)) ####### BUILDBOT SERVICES diff --git a/docker/Dockerfile b/docker/Dockerfile index c4d4629..731473d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,6 +11,8 @@ RUN pip3 install https://daniele.vigano.me/files/pypi/Twisted-17.9.0-cp36-cp36m- RUN useradd -u 1003 builder && \ usermod -a -G mock builder +RUN echo "builder ALL=(ALL) NOPASSWD: /usr/bin/dnf" >> /etc/sudoers + USER builder ENV HOME /home/builder WORKDIR ${HOME}