From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0A11B158042 for ; Sat, 9 Nov 2024 09:08:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BE63E08FA; Sat, 9 Nov 2024 09:08:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5505BE08FA for ; Sat, 9 Nov 2024 09:08:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 956B033BF08 for ; Sat, 9 Nov 2024 09:08:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 110AE1E65 for ; Sat, 9 Nov 2024 09:08:25 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1731143239.d776ca4a8c3906675b25d02f694adc228befaa21.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-worker/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/buildbot-worker/Manifest dev-util/buildbot-worker/buildbot-worker-4.1.0.ebuild X-VCS-Directories: dev-util/buildbot-worker/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d776ca4a8c3906675b25d02f694adc228befaa21 X-VCS-Branch: master Date: Sat, 9 Nov 2024 09:08:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e88642ae-3c9b-4817-9369-9d822681746f X-Archives-Hash: dafe55043191d282a6072c8c9f928467 commit: d776ca4a8c3906675b25d02f694adc228befaa21 Author: Magnus Granberg gentoo org> AuthorDate: Sun Oct 27 08:16:10 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Nov 9 09:07:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d776ca4a dev-util/buildbot-worker: add 4.1.0 Signed-off-by: Magnus Granberg gentoo.org> Signed-off-by: Sam James gentoo.org> dev-util/buildbot-worker/Manifest | 1 + .../buildbot-worker/buildbot-worker-4.1.0.ebuild | 137 +++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest index bd4933430c97..6a562b626747 100644 --- a/dev-util/buildbot-worker/Manifest +++ b/dev-util/buildbot-worker/Manifest @@ -2,3 +2,4 @@ DIST buildbot-worker-3.11.0-remove_py27.tar.gz 7134 BLAKE2B 8c92f8425b9a8d60e462 DIST buildbot-worker-3.11.0.tar.gz 131028 BLAKE2B 644e10f1d90c75a9f20439bc902764d9f69b16781d710e56bf4cad40d30f06f137d6a00d4c450c1589909ca93c98ff9a0cd6e1363a8feff58a4832e0096aada7 SHA512 73f42495bd252e75cd984d3222663260079887caadff29b69c23f188a1f3208fc6e2acfa38553fb5615ba1c3d4996655c96faa16ba0eb7335c6290ce3ce58679 DIST buildbot-worker-3.11.1.tar.gz 131129 BLAKE2B d8466c086261c612e976586b4589ca20617f5b9a7b69ccf276500fd351caead1425ae24897c4db242024de53f83c98b869dd9035bc366d9ee0376290307922a0 SHA512 c4560f69a15434cf93a43521bd1bbb568937a6ad8be338bca9089c9f449c3d0c5b8f000abf06a5fcfe4ebf5b206a9c81417a91cee633b67ca89ee67497a8368a DIST buildbot_worker-3.11.9.tar.gz 133480 BLAKE2B 61fb60b933d3469683b514fff3c204a4e8d1d143654c87659be37d217af307794e2e31dbe800897521d4755e36d9b7ae19a708420caeea8677610e8187d58a10 SHA512 8c313317f4815abf7d944d176702a8f6058a212766a41e48d7ca43a2bde626f609185b1beba59810e19cf751cf90eacb718731d937ff4b0a34d97cad0d35fc37 +DIST buildbot_worker-4.1.0.tar.gz 127579 BLAKE2B da2cd7b1443957e0a8d363030d0bfc5902d4ff88c88e49d9db9a9be5a7e54fc5878a004ddea3d91097c5549c76df58608c952dacb570d0b214c402e1e6884df8 SHA512 fd0f42eb2495498535ab627774922b030c61e60c6ea457588bbebfce2972322b15ee9f5cc16b3b4c7d80ddcf786ecddbc840447dc1fa07ade2676f5e3904ff50 diff --git a/dev-util/buildbot-worker/buildbot-worker-4.1.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-4.1.0.ebuild new file mode 100644 index 000000000000..b710bc00ca82 --- /dev/null +++ b/dev-util/buildbot-worker/buildbot-worker-4.1.0.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( python3_{10..12} ) +PYPI_PN=${PN/-/_} +inherit readme.gentoo-r1 systemd distutils-r1 pypi + +DESCRIPTION="BuildBot Worker (slave) Daemon" +HOMEPAGE="https://buildbot.net/ + https://github.com/buildbot/buildbot + https://pypi.org/project/buildbot-worker/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~sparc ~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/six[${PYTHON_USEDEP}] + >=dev-python/twisted-21.2.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + ${RDEPEND} + dev-python/parameterized[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + ) +" + +DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added +to support starting buildbot_worker through Gentoo's init system. To use this, +execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. +Set up your build worker following the documentation, make sure the +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!" + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + if [[ -n ${REPLACING_VERSIONS} ]]; then + ewarn + ewarn "More than one instance of a buildbot_worker can be run simultaneously." + ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file" + ewarn "is now the common base directory for all instances. If you are migrating from an older" + ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." + ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." + ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" + ewarn " ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance" + ewarn " rc-update add buildbot_worker.myinstance default" + ewarn " /etc/init.d/buildbot_worker.myinstance start" + ewarn "Systems using systemd can do the following:" + ewarn " systemctl enable buildbot_worker@myinstance.service" + ewarn " systemctl enable buildbot_worker.target" + ewarn " systemctl start buildbot_worker.target" + fi +} + +pkg_config() { + local buildworker_path="/var/lib/buildbot_worker" + local log_path="/var/log/buildbot_worker" + + einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}." + einfo "Press Control-C to abort." + + einfo "Enter the name for the new instance: " + read instance_name + [[ -z "${instance_name}" ]] && die "Invalid instance name" + + local instance_path="${buildworker_path}/${instance_name}" + local instance_log_path="${log_path}/${instance_name}" + + if [[ -e "${instance_path}" ]]; then + eerror "The instance with the specified name already exists:" + eerror "${instance_path}" + die "Instance already exists" + fi + + if [[ ! -d "${instance_path}" ]]; then + mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}" + fi + chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed" + cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \ + || die "Moving sample configuration failed" + ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \ + || die "Unable to create link to init file" + + if [[ ! -d "${instance_log_path}" ]]; then + mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" + chown --recursive buildbot:buildbot "${instance_log_path}" \ + || die "Setting permissions for instance failed" + fi + ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ + || die "Unable to create link to log file" + + einfo "Successfully created a buildbot_worker instance at ${instance_path}." + einfo "To change the default settings edit the buildbot.tac file in this directory." +}