From 49514530a8d66c0078302b3363bf2d9f825bbcb6 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Mon, 15 Jan 2018 17:05:11 -0800 Subject: [PATCH] dev-util/buildbot: Version bump, update 9999 ebuild Package-Manager: Portage-2.3.16, Repoman-2.3.6 --- dev-util/buildbot/Manifest | 1 + dev-util/buildbot/buildbot-0.9.15_p1.ebuild | 210 ++++++++++++++++++ dev-util/buildbot/buildbot-9999.ebuild | 10 +- ...ot-0.9.15_p1-buildbotworkerdocker.py.patch | 32 +++ dev-util/buildbot/metadata.xml | 1 + 5 files changed, 251 insertions(+), 3 deletions(-) create mode 100644 dev-util/buildbot/buildbot-0.9.15_p1.ebuild create mode 100644 dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest index 1b4a50d57a51..d2609b51e79b 100644 --- a/dev-util/buildbot/Manifest +++ b/dev-util/buildbot/Manifest @@ -3,3 +3,4 @@ DIST buildbot-0.9.10.tar.gz 3112750 BLAKE2B f09b1e38a2920ae34f45d946e8d88bc52509 DIST buildbot-0.9.11.tar.gz 3096455 BLAKE2B 2582fd27e89fc684911926c272630bfdb3fb84e7c18dadff9e66f609a2976d2a70ba0f566af0a7805fe5a7a370e4215ce2ceca4187d418eaa7075414e6974106 SHA512 c68a657213b0f878d8c2b4e6ebe18cfc9b3e19a4eecaf085fd3e5631bbb78dc9bd14e6b3d4b576e78eb1631329c86331371200a350d33696204fb76e7beae81c DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d DIST buildbot-0.9.13.tar.gz 3061713 BLAKE2B fac74d610bf0ff1cfeea1c59c46e95339d6b080725f6b01258921175b8036daeef23dfd3bf2a71fe838d43b9d7777e3a3141ff9cec0e1c7e609f21c53f51b91d SHA512 b1cf176d01e04bc219be8ffa787a857aec7bcfb930c3e9cabe0410fca60d826c35e74d277cd5764fcd3c6183ea5f19bae195c09ad401cdd948bda500789f2ade +DIST buildbot-0.9.15.post1.tar.gz 3088947 BLAKE2B c9a0265d3df2a9ac01872fc7106b5b787334bd899a43fcdb6ad06aab5e0e8f1ddb4374bf5211f251f26985c3b11a0b981bdd23fb668ac1717af36443831648e6 SHA512 c5c72132fd8446fbb14467851063d192dbb817506163eacc3022d563698453c66706a895613ca1c17502dd25957b31f6409996497d2e7646ab2fdbb3fb55c31d diff --git a/dev-util/buildbot/buildbot-0.9.15_p1.ebuild b/dev-util/buildbot/buildbot-0.9.15_p1.ebuild new file mode 100644 index 000000000000..48d59be0032c --- /dev/null +++ b/dev-util/buildbot/buildbot-0.9.15_p1.ebuild @@ -0,0 +1,210 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PYTHON_REQ_USE="sqlite" +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" + +[[ ${PV} == *9999 ]] && inherit git-r3 +inherit readme.gentoo-r1 user systemd distutils-r1 + +MY_PV="${PV/_p/.post}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="BuildBot build automation system" +HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot" +[[ ${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="crypt doc docker examples irc test" + +RDEPEND=" + >=dev-python/jinja-2.1[${PYTHON_USEDEP}] + >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] + >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}] + dev-python/future[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] + >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] + dev-python/pyjwt[${PYTHON_USEDEP}] + >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] + ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] + crypt? ( + >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] + >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] + dev-python/idna[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + ) + irc? ( + dev-python/txrequests[${PYTHON_USEDEP}] + ) + docker? ( + >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] + ) +" +DEPEND="${RDEPEND} + >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] + doc? ( + >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] + dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}] + dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}] + dev-python/pyenchant[${PYTHON_USEDEP}] + >=dev-python/docutils-0.8[${PYTHON_USEDEP}] + =dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + dev-python/moto[${PYTHON_USEDEP}] + dev-python/boto3[${PYTHON_USEDEP}] + dev-python/ramlfications[${PYTHON_USEDEP}] + dev-python/pyjade[${PYTHON_USEDEP}] + dev-python/txgithub[${PYTHON_USEDEP}] + dev-python/txrequests[${PYTHON_USEDEP}] + dev-python/lz4[${PYTHON_USEDEP}] + dev-python/treq[${PYTHON_USEDEP}] + dev-python/setuptools_trial[${PYTHON_USEDEP}] + ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] + >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] + )" + +S=${WORKDIR}/${MY_P} +[[ ${PV} == *9999 ]] && S=${S}/master + +#PATCHES=( +# "${FILESDIR}/${P}-buildbotworkerdocker.py.patch" +#) + +pkg_setup() { + enewuser buildbot + + DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added + to support starting buildbot through Gentoo's init system. To use this, + execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. + The scripts can run as a different user if desired." +} + +src_compile() { + distutils-r1_src_compile + + if use doc; then + einfo "Generation of documentation" + pushd docs > /dev/null + #'man' target is currently broken + emake html + popd > /dev/null + fi +} + +src_install() { + distutils-r1_src_install + + doman docs/buildbot.1 + + if use doc; then + dohtml -r docs/_build/html/ + # TODO: install man pages + fi + + if use examples; then + insinto /usr/share/doc/${PF} + doins -r docs/examples + fi + + newconfd "${FILESDIR}/buildmaster.confd" buildmaster + newinitd "${FILESDIR}/buildmaster.initd" buildmaster + systemd_dounit "${FILESDIR}/buildmaster.target" + systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service" + systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service" + + readme.gentoo_create_doc +} + +python_test() { + distutils_install_for_testing + + esetup.py test || die "Tests failed under ${EPYTHON}" +} + +pkg_postinst() { + readme.gentoo_print_elog + + if [[ -n ${REPLACING_VERSIONS} ]]; then + ewarn + ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster" + ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot 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 buildmaster 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/buildmaster /etc/init.d/buildmaster.myinstance" + ewarn " rc-update add buildmaster.myinstance default" + ewarn " /etc/init.d/buildmaster.myinstance start" + ewarn "Systems using systemd can do the following:" + ewarn " systemctl enable buildmaster@myinstance.service" + ewarn " systemctl enable buildmaster.target" + ewarn " systemctl start buildmaster.target" + elog + elog "Upstream recommends the following when upgrading:" + elog "Each time you install a new version of Buildbot, you should run the" + elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters." + elog "This will add files and fix (or at least detect) incompatibilities between" + elog "your old config and the new code." + fi + elog + elog "In order to create a new instance of buildmaster, execute:" + elog " emerge --config =${CATEGORY}/${PF}" +} + +pkg_config() { + local buildmaster_path="/var/lib/buildmaster" + local log_path="/var/log/buildmaster" + + einfo "This will prepare a new buildmaster instance in ${buildmaster_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="${buildmaster_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 + + local buildbot="/usr/bin/buildbot" + if [[ ! -d "${buildmaster_path}" ]]; then + mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}" + fi + "${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed" + chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed" + mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \ + || die "Moving sample configuration failed" + ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${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 buildmaster instance at ${instance_path}." + einfo "To change the default settings edit the master.cfg file in this directory." +} diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild index a9a9d7adf5f6..4d20f12a6a23 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" [[ ${PV} == *9999 ]] && inherit git-r3 inherit readme.gentoo-r1 user systemd distutils-r1 -MY_PV="${PV/_p/p}" +MY_PV="${PV/_p/.post}" MY_P="${PN}-${MY_PV}" DESCRIPTION="BuildBot build automation system" @@ -25,7 +25,7 @@ else KEYWORDS="~amd64" fi -IUSE="crypt doc examples irc test" +IUSE="crypt doc docker examples irc test" RDEPEND=" >=dev-python/jinja-2.1[${PYTHON_USEDEP}] @@ -48,6 +48,9 @@ RDEPEND=" irc? ( dev-python/txrequests[${PYTHON_USEDEP}] ) + docker? ( + >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] + ) " DEPEND="${RDEPEND} >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] @@ -74,6 +77,7 @@ DEPEND="${RDEPEND} dev-python/treq[${PYTHON_USEDEP}] dev-python/setuptools_trial[${PYTHON_USEDEP}] ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] + >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] )" S=${WORKDIR}/${MY_P} diff --git a/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch b/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch new file mode 100644 index 000000000000..db08d7a45dd3 --- /dev/null +++ b/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch @@ -0,0 +1,32 @@ +From 7051ebdac8c8a9054e8a37ab7dd8fb6f0ac1affb Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Mon, 15 Jan 2018 13:50:36 -0800 +Subject: [PATCH] master/buildbot/worker/docker.py: Fix test fail when docker + is not installed + +This fixes numerous tracebacks (note, only partial traceback): + + File "/usr/lib64/python3.6/site-packages/buildbot/worker/docker.py", line 259, in _thd_start_instance + if docker_py_version >= 2.2: +builtins.NameError: name 'docker_py_version' is not defined + +With this patch, the tests pass. +--- + master/buildbot/worker/docker.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/buildbot/worker/docker.py b/master/buildbot/worker/docker.py +index 62e30785f..e558d69ff 100644 +--- a/buildbot/worker/docker.py ++++ b/buildbot/worker/docker.py +@@ -41,6 +41,7 @@ try: + except ImportError: + docker = None + client = None ++ docker_py_version = 0.0 + + + def _handle_stream_line(line): +-- +2.15.1 + diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml index dc8748343ec6..a40eac4867f1 100644 --- a/dev-util/buildbot/metadata.xml +++ b/dev-util/buildbot/metadata.xml @@ -24,6 +24,7 @@ * released under the GPL + Add support for worker docker command steps Add support for status delivery through an ircbot. Add support for watching a maildir for commits. Add support for manhole (debug over ssh) -- 2.26.2