dani/qgis3-cd-copr
1
0
Fork 0
mirror of https://github.com/daniviga/qgis3-cd-copr.git synced 2024-11-23 01:46:13 +01:00
Code Issues Releases Activity

Add support for F27

Browse Source
This commit is contained in:
Daniele Viganò 2017-10-25 16:25:12 +02:00
parent 7eae72155f
commit 16289a06e8
3 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
buildbot/master.cfg
View File

@ -18,10 +18,14 @@ c = BuildmasterConfig = {}
# worker name and password must be configured on the worker. # worker name and password must be configured on the worker.
#c['workers'] = [worker.Worker("worker", "work3rP@ss!")] #c['workers'] = [worker.Worker("worker", "work3rP@ss!")]
c['workers'] = [ c['workers'] = [
worker.DockerLatentWorker('docker', 'work3rP@ss!', worker.DockerLatentWorker('f26', 'work3rP@ss!',
docker_host='unix:///var/run/docker.sock', docker_host='unix:///var/run/docker.sock',
image='buildbot-worker', image='buildbot-worker:26',
hostconfig={'cap_add': ['SYS_ADMIN']}) hostconfig={'cap_add': ['SYS_ADMIN']}),
worker.DockerLatentWorker('f27', 'work3rP@ss!',
docker_host='unix:///var/run/docker.sock',
image='buildbot-worker:27',
hostconfig={'cap_add': ['SYS_ADMIN']}),
] ]
# 'protocols' contains information about protocols which master will use for # 'protocols' contains information about protocols which master will use for
# communicating with workers. You must define at least 'port' option that workers # communicating with workers. You must define at least 'port' option that workers
@ -58,8 +62,11 @@ c['schedulers'].append(schedulers.ForceScheduler(
name="Force_QGIS", name="Force_QGIS",
builderNames=["qgis"])) builderNames=["qgis"]))
c['schedulers'].append(schedulers.ForceScheduler( c['schedulers'].append(schedulers.ForceScheduler(
name="Force_QGIS_DNF", name="Force_QGIS_DNF_F26",
builderNames=["qgis_dnf"])) builderNames=["qgis_dnf_f26"]))
c['schedulers'].append(schedulers.ForceScheduler(
name="Force_QGIS_DNF_F27",
builderNames=["qgis_dnf_f27"]))
####### BUILDERS ####### BUILDERS
@ -83,23 +90,27 @@ qgis_factory.addStep(steps.ShellCommand(command=["copr-cli", "build", "qgis-test
qgis_install_factory = util.BuildFactory() qgis_install_factory = util.BuildFactory()
qgis_install_factory.addStep(steps.ShellCommand(command=["/usr/bin/sudo", "dnf", "copr", "enable", "-y", "dani/qgis-testing"], qgis_install_factory.addStep(steps.ShellCommand(command=["/usr/bin/sudo", "dnf", "copr", "enable", "-y", "dani/qgis-testing"],
name="[F26] Add COPR")) name="Add COPR"))
qgis_install_factory.addStep(steps.ShellCommand(command=["/usr/bin/sudo", "dnf", "install", "--refresh", "-y", "qgis", qgis_install_factory.addStep(steps.ShellCommand(command=["/usr/bin/sudo", "dnf", "install", "--refresh", "-y", "qgis",
"python3-qgis", "qgis-server", "qgis-grass"], "python3-qgis", "qgis-server", "qgis-grass"],
name="[F26] Run DNF")) name="Run DNF"))
qgis_install_factory.addStep(steps.ShellCommand(command=["/usr/bin/qgis", "--help"], qgis_install_factory.addStep(steps.ShellCommand(command=["/usr/bin/qgis", "--help", "|| true"],
name="[F26] Run QGIS")) name="Run QGIS"))
# th_factory = util.BuildFactory() # dummy # th_factory = util.BuildFactory() # dummy
c['builders'] = [] c['builders'] = []
c['builders'].append( c['builders'].append(
util.BuilderConfig(name="qgis", util.BuilderConfig(name="qgis",
workernames=["docker"], workernames=["f26"],
factory=qgis_factory)) factory=qgis_factory))
c['builders'].append( c['builders'].append(
util.BuilderConfig(name="qgis_dnf", util.BuilderConfig(name="qgis_dnf_f26",
workernames=["docker"], workernames=["f26"],
factory=qgis_install_factory))
c['builders'].append(
util.BuilderConfig(name="qgis_dnf_f27",
workernames=["f27"],
factory=qgis_install_factory)) factory=qgis_install_factory))
####### BUILDBOT SERVICES ####### BUILDBOT SERVICES

6
docker/Dockerfile.f26
View File

@ -1,5 +1,5 @@
# vi:syntax=dockerfile # vi:syntax=dockerfile
FROM fedora:26 FROM registry.fedoraproject.org/fedora:26
MAINTAINER Daniele Viganò <daniele@vigano.me> MAINTAINER Daniele Viganò <daniele@vigano.me>
RUN dnf install -y sudo tar bzip2 git python3-pip mock copr-cli && \ RUN dnf install -y sudo tar bzip2 git python3-pip mock copr-cli && \
@ -8,7 +8,7 @@ RUN dnf install -y sudo tar bzip2 git python3-pip mock copr-cli && \
RUN pip3 install https://daniele.vigano.me/files/pypi/Twisted-17.9.0-cp36-cp36m-linux_x86_64.whl \ RUN pip3 install https://daniele.vigano.me/files/pypi/Twisted-17.9.0-cp36-cp36m-linux_x86_64.whl \
buildbot-worker buildbot-worker
RUN useradd -u 1003 builder && \ RUN useradd -u 1000 builder && \
usermod -a -G mock builder usermod -a -G mock builder
RUN echo "builder ALL=(ALL) NOPASSWD: /usr/bin/dnf" >> /etc/sudoers RUN echo "builder ALL=(ALL) NOPASSWD: /usr/bin/dnf" >> /etc/sudoers
@ -19,7 +19,7 @@ WORKDIR ${HOME}
COPY copr $HOME/.config/copr COPY copr $HOME/.config/copr
RUN buildbot-worker create-worker $HOME 172.17.0.1 docker work3rP@ss! && \ RUN buildbot-worker create-worker $HOME 172.17.0.1 f26 work3rP@ss! && \
echo "Daniele Viganò <daniel@vigano.me>" > info/admin && \ echo "Daniele Viganò <daniel@vigano.me>" > info/admin && \
echo "Docker running Fedora 26 (x86_64)" > info/host echo "Docker running Fedora 26 (x86_64)" > info/host

10
docker/Dockerfile.f27
View File

@ -1,5 +1,5 @@
# vi:syntax=dockerfile # vi:syntax=dockerfile
FROM fedora:27 FROM registry.fedoraproject.org/fedora:27
MAINTAINER Daniele Viganò <daniele@vigano.me> MAINTAINER Daniele Viganò <daniele@vigano.me>
RUN dnf install -y sudo tar bzip2 git python3-pip mock copr-cli && \ RUN dnf install -y sudo tar bzip2 git python3-pip mock copr-cli && \
@ -8,7 +8,7 @@ RUN dnf install -y sudo tar bzip2 git python3-pip mock copr-cli && \
RUN pip3 install https://daniele.vigano.me/files/pypi/Twisted-17.9.0-cp36-cp36m-linux_x86_64.whl \ RUN pip3 install https://daniele.vigano.me/files/pypi/Twisted-17.9.0-cp36-cp36m-linux_x86_64.whl \
buildbot-worker buildbot-worker
RUN useradd -u 1003 builder && \ RUN useradd -u 1000 builder && \
usermod -a -G mock builder usermod -a -G mock builder
RUN echo "builder ALL=(ALL) NOPASSWD: /usr/bin/dnf" >> /etc/sudoers RUN echo "builder ALL=(ALL) NOPASSWD: /usr/bin/dnf" >> /etc/sudoers
@ -19,9 +19,9 @@ WORKDIR ${HOME}
COPY copr $HOME/.config/copr COPY copr $HOME/.config/copr
RUN buildbot-worker create-worker $HOME 172.17.0.1 docker work3rP@ss! && \ RUN buildbot-worker create-worker $HOME 172.17.0.1 f27 work3rP@ss! && \
echo "Daniele Viganò <daniel@vigano.me>" > info/admin && \ echo "Daniele Viganò <daniel@vigano.me>" > info/admin && \
echo "Docker running Fedora 26 (x86_64)" > info/host echo "Docker running Fedora 27 (x86_64)" > info/host
ENTRYPOINT ["/usr/bin/buildbot-worker"] ENTRYPOINT ["/usr/local/bin/buildbot-worker"]
CMD ["start", "--nodaemon"] CMD ["start", "--nodaemon"]