commit: a5c9380e5bc0d5a1af94b6b8f6c7ddd28f7388b5 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Tue Mar 13 20:43:01 2018 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Tue Mar 13 23:56:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c9380e
dev-util/buildbot-worker: Clean old versions Clean out old initd and confd files. Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-util/buildbot-worker/Manifest | 2 - .../buildbot-worker-0.9.10-r2.ebuild | 133 --------------------- .../buildbot-worker/buildbot-worker-0.9.11.ebuild | 133 --------------------- .../buildbot-worker/files/buildbot_worker.confd | 9 -- .../buildbot-worker/files/buildbot_worker.initd | 48 -------- 5 files changed, 325 deletions(-) diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest index 32e7b43928c..8444ffed398 100644 --- a/dev-util/buildbot-worker/Manifest +++ b/dev-util/buildbot-worker/Manifest @@ -1,5 +1,3 @@ -DIST buildbot-worker-0.9.10.tar.gz 99028 BLAKE2B 8cbbcceceb60afa6194c1e1c8f7382eb92a6e7517aa94477656f81c0c3eed38d39d85f1e98a37481fde39d24726c1dce73a6e8b9f2615faa2592f16900a4efd3 SHA512 0f515610d9c788657b10ba6624745841241fe554b472e53abdda221a678eb73d7a21a6529eb0769450de3a79b43bb6e51f4208247a4d8ef25c3d36b6ced6ec89 -DIST buildbot-worker-0.9.11.tar.gz 100746 BLAKE2B ad8111100ee565cb70a7234e1527b5145e40d791341f16e4b415fc0d2dbd33cdc226b462ebb4de370ba3731df0d81217d797691e1c8cb1fcbf73c199674968ce SHA512 c7209c3fff8c43a23de71fa61709c9f02a5bdd9c8c8980ac5d205f720abdaa9bdb78d0d4e40fe9f915c8d5cf253b9e3c63401712ee121ac085909b0244d82897 DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015869fd6115789a7ddcecdebdac8707850715c677ee248668f73035ea5656665973634829f2f97e3e75fe8e1515cb0838b88 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57 DIST buildbot-worker-0.9.13.tar.gz 102710 BLAKE2B ab60bc2607a706ecc760c2439655bca3f328d773fbb07e73c994f079356341a251ca23c573a71cce92dbf71ba62ceaa70210f8925fd4d1cdfac335b2a485ee9f SHA512 920f76d70c88a660b1d4c15683847a144b8dfaa01b91742ff2fedbe013ab030d3c5f07b6308f8bfb3f7bf3c2f805f7735d007e67257ca5233d2b585518f79e40 DIST buildbot-worker-0.9.15.post1.tar.gz 100901 BLAKE2B 5e4744fcd69e2920e0ca9ba0b1aa77ea5f62ed4aecc9f00df17953dc813e1f8d61a859ab0aacc26f88f51d281574a8089b849fe063d55c8649c4a53b528d8ba8 SHA512 6ee23f1dd52672646f28978cec3fa9e29b64cae84f524bbcb6f2614a4a56e49e8363975b89cd3508e78c9779233a27403e46fc098be0808d6cfc1e6aa6b8499f diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.10-r2.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.10-r2.ebuild deleted file mode 100644 index 419fd619809..00000000000 --- a/dev-util/buildbot-worker/buildbot-worker-0.9.10-r2.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python2_7 python3_5 ) - -EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"; - -[[ ${PV} == *9999 ]] && inherit git-r3 -inherit readme.gentoo user distutils-r1 - -DESCRIPTION="BuildBot Worker (slave) Daemon" -HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"; - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" -[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64" -fi -IUSE="test" - -RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}] - !<dev-util/buildbot-0.9.7 -" -DEPEND="${RDEPEND} - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/setuptools_trial[${PYTHON_USEDEP}] - ) -" - -S="${WORKDIR}/${MY_P}" -[[ ${PV} == *9999 ]] && S=${S}/slave - -pkg_setup() { - enewuser buildbot - - 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." -} - -python_test() { - distutils_install_for_testing - - esetup.py test || die "Tests failed under ${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 - - 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 "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker" - ewarn "can be run simultaneously. 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 "${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}" - 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." -} diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.11.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.11.ebuild deleted file mode 100644 index 0697e9a2ce0..00000000000 --- a/dev-util/buildbot-worker/buildbot-worker-0.9.11.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python2_7 python3_5 ) - -EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"; - -[[ ${PV} == *9999 ]] && inherit git-r3 -inherit readme.gentoo user distutils-r1 - -DESCRIPTION="BuildBot Worker (slave) Daemon" -HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"; - -MY_V="${PV/_p/p}" -MY_P="${PN}-${MY_V}" -[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64" -fi -IUSE="test" - -RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}] - !<dev-util/buildbot-0.9.7 -" -DEPEND="${RDEPEND} - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/setuptools_trial[${PYTHON_USEDEP}] - ) -" - -S="${WORKDIR}/${MY_P}" -[[ ${PV} == *9999 ]] && S=${S}/slave - -pkg_setup() { - enewuser buildbot - - 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." -} - -python_test() { - distutils_install_for_testing - - esetup.py test || die "Tests failed under ${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 - - 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 "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker" - ewarn "can be run simultaneously. 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 "${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}" - 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." -} diff --git a/dev-util/buildbot-worker/files/buildbot_worker.confd b/dev-util/buildbot-worker/files/buildbot_worker.confd deleted file mode 100644 index 7e77999cf0c..00000000000 --- a/dev-util/buildbot-worker/files/buildbot_worker.confd +++ /dev/null @@ -1,9 +0,0 @@ -# Path to the build slave's basedir. -BASEDIR="/var/lib/buildbot_worker" - -# User account for the buildslave. -# The basedir should be owned by this user. -USERNAME="buildbot" - -# Extra options passed to twistd. -TWISTD_OPTS="" diff --git a/dev-util/buildbot-worker/files/buildbot_worker.initd b/dev-util/buildbot-worker/files/buildbot_worker.initd deleted file mode 100644 index 8b13460491e..00000000000 --- a/dev-util/buildbot-worker/files/buildbot_worker.initd +++ /dev/null @@ -1,48 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -checkconfig() { - if [ -z "${BASEDIR}" ]; then - eerror "BASEDIR not set" - return 1 - fi - if [ -z "${USERNAME}" ]; then - eerror "USERNAME not set" - return 1 - fi - if [ ! -d "${BASEDIR}" ]; then - eerror "${BASEDIR} is not a directory" - return 1 - fi - if [ ! -e "${BASEDIR}/buildbot.tac" ]; then - eerror "${BASEDIR} does not contain buildbot.tac" - return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting buildslave in ${BASEDIR}" - # We set HOME here to make something valid show up in the env of child - # processes spawned by the buildslave. - start-stop-daemon --start -u "${USERNAME}" \ - --pidfile "${BASEDIR}/buildbot_worker.pid" \ - --env HOME="${BASEDIR}" \ - --exec /usr/bin/twistd -- \ - --no_save \ - --logfile="${BASEDIR}/twistd.log" \ - --pidfile="${BASEDIR}/buildbot_worker.pid" \ - --python="${BASEDIR}/buildbot.tac" - eend $? -} - -stop() { - ebegin "Stopping buildslave in ${BASEDIR}" - start-stop-daemon --stop --pidfile "${BASEDIR}/buildbot_worker.pid" - eend $? -}
