commit: 49514530a8d66c0078302b3363bf2d9f825bbcb6 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Tue Jan 16 01:05:11 2018 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Tue Jan 16 17:41:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49514530
dev-util/buildbot: Version bump, update 9999 ebuild Package-Manager: Portage-2.3.16, Repoman-2.3.6 dev-util/buildbot/Manifest | 1 + ...ldbot-9999.ebuild => buildbot-0.9.15_p1.ebuild} | 14 ++++++++-- dev-util/buildbot/buildbot-9999.ebuild | 10 +++++-- ...uildbot-0.9.15_p1-buildbotworkerdocker.py.patch | 32 ++++++++++++++++++++++ dev-util/buildbot/metadata.xml | 1 + 5 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest index 1b4a50d57a5..d2609b51e79 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-9999.ebuild b/dev-util/buildbot/buildbot-0.9.15_p1.ebuild similarity index 96% copy from dev-util/buildbot/buildbot-9999.ebuild copy to dev-util/buildbot/buildbot-0.9.15_p1.ebuild index a9a9d7adf5f..48d59be0032 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-0.9.15_p1.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,11 +77,16 @@ 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} [[ ${PV} == *9999 ]] && S=${S}/master +#PATCHES=( +# "${FILESDIR}/${P}-buildbotworkerdocker.py.patch" +#) + pkg_setup() { enewuser buildbot diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild index a9a9d7adf5f..4d20f12a6a2 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 00000000000..db08d7a45dd --- /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 <[email protected]> +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 dc8748343ec..a40eac4867f 100644 --- a/dev-util/buildbot/metadata.xml +++ b/dev-util/buildbot/metadata.xml @@ -24,6 +24,7 @@ * released under the GPL </longdescription> <use> + <flag name="docker">Add support for worker docker command steps</flag> <flag name="irc">Add support for status delivery through an ircbot.</flag> <flag name="mail">Add support for watching a maildir for commits.</flag> <flag name="manhole">Add support for manhole (debug over ssh)</flag>
