commit: fca5d7800b100f298b2f75b58ed733a0585e03af Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Fri Sep 23 02:16:07 2022 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Fri Sep 23 03:00:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca5d780
dev-util/buildbot-worker: Version bump to 3.6.1 Update 9999 Add systemd service files Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> dev-util/buildbot-worker/Manifest | 1 + ...er-9999.ebuild => buildbot-worker-3.6.1.ebuild} | 24 ++++++++++++++++++---- .../buildbot-worker/buildbot-worker-9999.ebuild | 8 ++++++++ .../buildbot-worker/files/buildbot_worker.confd2 | 2 +- .../buildbot-worker/files/buildbot_worker.service | 12 +++++++++++ .../buildbot-worker/files/buildbot_worker.target | 5 +++++ .../files/buildbot_worker_at.service | 14 +++++++++++++ .../files/buildbot_worker_at.service.conf | 5 +++++ 8 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest index f922e58e8ae9..79bd8d18300c 100644 --- a/dev-util/buildbot-worker/Manifest +++ b/dev-util/buildbot-worker/Manifest @@ -1,3 +1,4 @@ DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc SHA512 411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7 DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774 SHA512 1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed DIST buildbot-worker-3.6.0.tar.gz 120158 BLAKE2B c762237d802f6eff1c6b74f0ed364ecf085d762c80f6cc90edc1fed0084c7bf6a0b74b6fcaf8611b9c21b6249bde547d5a10bc7ff5b4588d138b2ebf76e823a3 SHA512 6b5f50694fe1559dacba599f8641c6b370cad4b68c8182e8a6e31528ffbeeed81c405fd764e3718003913fe5fe8d9faa920a2ad81373fbd028cbf046ed0d3136 +DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 010893b7b4e5710654299b2541c4cdcdad47b3b763dbc7e2336e5480c841908e04d8350c7cb42edd9ea99d16fd26f36a524a6d6bec8c0f933665a02ded369f89 SHA512 f1e3bf7c0da2f31dd446dc16487e32fddaecc0c2f9c17c469146707322a3d7bb2cc77db4f6145c62530bce58dd61aa19e008e944a7f39a17dc66f1317ee26e1b diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild similarity index 87% copy from dev-util/buildbot-worker/buildbot-worker-9999.ebuild copy to dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild index 6fb30ec0ecab..e2d1ed832b13 100644 --- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild +++ b/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild @@ -5,29 +5,33 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{8..10} ) -EGIT_REPO_URI="https://github.com/buildbot/buildbot.git" -inherit readme.gentoo-r1 git-r3 distutils-r1 +inherit readme.gentoo-r1 systemd distutils-r1 + +MY_V="${PV/_p/.post}" +MY_P="${PN}-${MY_V}" DESCRIPTION="BuildBot Worker (slave) Daemon" HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/" -S="${S}/worker" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" +KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" acct-user/buildbot >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}] >=dev-python/twisted-18.7.0[${PYTHON_USEDEP}] dev-python/future[${PYTHON_USEDEP}] !<dev-util/buildbot-1.0.0 " BDEPEND=" - >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}] test? ( ${RDEPEND} dev-python/mock[${PYTHON_USEDEP}] @@ -44,17 +48,29 @@ resulting directories are owned by the \"buildbot\" user and point \"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location. The scripts can run as a different user if desired." +src_prepare() { + # Remove shipped windows start script + sed -e "/'buildbot_worker_windows_service=buildbot_worker.scripts.windows_service:HandleCommandLine',/d" \ + -i setup.py || die + + distutils-r1_src_prepare +} + python_test() { "${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}" } python_install_all() { + distutils-r1_python_install_all doman docs/buildbot-worker.1 newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker + systemd_dounit "${FILESDIR}/buildbot_worker.target" + systemd_newunit "${FILESDIR}/buildbot_worker_at.service" "buildbot_worker@.service" + systemd_install_serviced "${FILESDIR}/buildbot_worker_at.service.conf" "buildbot_worker@.service" dodir /var/lib/buildbot_worker cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!" diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild index 6fb30ec0ecab..e22995dc22fa 100644 --- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild +++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild @@ -44,6 +44,14 @@ resulting directories are owned by the \"buildbot\" user and point \"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location. The scripts can run as a different user if desired." +src_prepare() { + # Remove shipped windows start script + sed -e "/'buildbot_worker_windows_service=buildbot_worker.scripts.windows_service:HandleCommandLine',/d" \ + -i setup.py || die + + distutils-r1_src_prepare +} + python_test() { "${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}" } diff --git a/dev-util/buildbot-worker/files/buildbot_worker.confd2 b/dev-util/buildbot-worker/files/buildbot_worker.confd2 index f14e3210ca99..2ce321f522c4 100644 --- a/dev-util/buildbot-worker/files/buildbot_worker.confd2 +++ b/dev-util/buildbot-worker/files/buildbot_worker.confd2 @@ -10,5 +10,5 @@ TWISTD_OPTS="" # Optional specific python version to run in # (if not the system default version) -# ie: RUNTIME_PYTHON="/usr/bin/python2.7" +# ie: RUNTIME_PYTHON="/usr/bin/python3.8" RUNTIME_PYTHON="" diff --git a/dev-util/buildbot-worker/files/buildbot_worker.service b/dev-util/buildbot-worker/files/buildbot_worker.service new file mode 100644 index 000000000000..e75a2d51e4f3 --- /dev/null +++ b/dev-util/buildbot-worker/files/buildbot_worker.service @@ -0,0 +1,12 @@ +[Unit] +Description=buildbot worker (slave) instances +After=local-fs.target network.target + +[Service] +Type=forking +User=buildbot +ExecStart=/usr/bin/buildbot_worker start /var/lib/buildbot_worker +ExecStop=/usr/bin/buildbot_worker stop /var/lib/buildbot_worker + +[Install] +WantedBy=multi-user.target diff --git a/dev-util/buildbot-worker/files/buildbot_worker.target b/dev-util/buildbot-worker/files/buildbot_worker.target new file mode 100644 index 000000000000..4a2b3e2d52f3 --- /dev/null +++ b/dev-util/buildbot-worker/files/buildbot_worker.target @@ -0,0 +1,5 @@ +[Unit] +Description=Buildbot-Worker target that allows to start or stop all buildbot_worker@*.service instances + +[Install] +WantedBy=multi-user.target diff --git a/dev-util/buildbot-worker/files/buildbot_worker_at.service b/dev-util/buildbot-worker/files/buildbot_worker_at.service new file mode 100644 index 000000000000..6b8849920f79 --- /dev/null +++ b/dev-util/buildbot-worker/files/buildbot_worker_at.service @@ -0,0 +1,14 @@ +[Unit] +Description=buildbot-worker daemon +After=local-fs.target network.target +PartOf=buildbot_worker.target + +[Service] +Environment=BASEDIR=/var/lib/buildbot_worker +Type=forking +User=buildbot +ExecStart=/usr/bin/buildbot-worker start ${BASEDIR}/%i +ExecStop=/usr/bin/buildbot-worker stop ${BASEDIR}/%i + +[Install] +WantedBy=buildbot_worker.target diff --git a/dev-util/buildbot-worker/files/buildbot_worker_at.service.conf b/dev-util/buildbot-worker/files/buildbot_worker_at.service.conf new file mode 100644 index 000000000000..8d37f9412e7d --- /dev/null +++ b/dev-util/buildbot-worker/files/buildbot_worker_at.service.conf @@ -0,0 +1,5 @@ +# Uncomment the following lines to configure the base directory for all buildmaster instances. + +#[Service] +#Environment=BASEDIR=/var/lib/buildbot_worker +