diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /dev-util/buildbot | |
parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) |
gentoo resync : 14.05.2020
Diffstat (limited to 'dev-util/buildbot')
-rw-r--r-- | dev-util/buildbot/Manifest | 8 | ||||
-rw-r--r-- | dev-util/buildbot/buildbot-2.7.0.ebuild | 192 | ||||
-rw-r--r-- | dev-util/buildbot/buildbot-9999.ebuild | 55 | ||||
-rw-r--r-- | dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch | 26 | ||||
-rw-r--r-- | dev-util/buildbot/files/pypugjs.patch | 84 | ||||
-rw-r--r-- | dev-util/buildbot/metadata.xml | 5 |
6 files changed, 344 insertions, 26 deletions
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest index ae576936e19d..da1edce16e6e 100644 --- a/dev-util/buildbot/Manifest +++ b/dev-util/buildbot/Manifest @@ -1,14 +1,18 @@ +AUX Add-gentoo-to-the-VERSION_ID-check-exclusion.patch 1137 BLAKE2B 0ced9724aafd4511542248846364011fc022b06016a329225c3203e4e932db0932d60ece526b095b60a30acfce0e700d8bfedaccf8d30c75b3c38a9e85b51814 SHA512 6e774541b8b2b229eb29171f78a46cd93f6c01056d410e0423ca757f5e5b956a4e29bb4a7b0c38d281e3afe126423e65bde8e367657fb663cb01ebc8c6f2c622 AUX Remove-distro-version-test.patch 804 BLAKE2B a568d6daaa349b4bf02b59c5a7ef88e6c3017e45840dc2f93d8459dea0d11924c92255446fa5f3ef851a38daec1e8140275cfaac6876705e7ec3a5fc6815a49d SHA512 b98005b8a02456d60bdc8085efb4c6fa52386e7b185bf7acefbaf3cd8fe481f87cad68a4d4986f498e35dca1618208032f0a73b04ca0515bbb2703729d3308fe AUX buildmaster.confd 362 BLAKE2B 72d36c02b825ab26e8d85348c3dc65800e03c8d9439a4ada658764b5f87e83e07eb89b1b5bedc59466135008135733319d8e4a31657c9f3f0c1713d1649ab820 SHA512 5b3e3cc75187d0b44c8e59cdfb605752db20913b025eadc7e673bc7c9c45b33e1a0d19362c0cc0c023cd32255946d510f172090ada9cbf2978f4807de29e2b72 AUX buildmaster.initd 1654 BLAKE2B baec16ceb91386629cc9ea0b22118dd3dd76ec6f50a1ced00ca246fd8b0e5df96d9ccb75620d4e8a96560f99a3a2ceaf8e113172a9ed4de238dc21c955470bec SHA512 a036559f61bd7d8f5834e9e9cc6bfaa7e8b70a694c6344482449c29c8168a34ecc180c908e7aab6b722e1487c51a53928693c0dcfbfd016622781bcfdb7d5d7b AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d +AUX pypugjs.patch 3631 BLAKE2B 168c865da59c947a00f4025108ff9fdedba55a9ce3a588e7fbe3f77d10dc88434baf8690edc4e5318d87c7823a551f2d796fd47b42cb0facb8cddfa29f6354bb SHA512 1ea242249f44ed1ea958e2771ce14f7cbeac6bbaec4e7bf803a38e2e386d604efbfe1158bbb0151d29a8891f55142ca0a0191063051f2ec56c3c3f053ccb2d8e DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d DIST buildbot-1.1.2.tar.gz 3101168 BLAKE2B 35ec56440014015850a69324d475c4ca9555ad90da85b26a7a43eca74f08361137021aec72ddca37cbb24f21519ebf45948e66214291f356b4a1fbada7c0b3b8 SHA512 14c28d6fae18a10d89d41509635188d881ac76e7b61758481a9afbb22eb384d7ab5080383242e5850af13bfe46877985a91036270c3c4fbf01eafee5b7699815 DIST buildbot-1.3.0.tar.gz 3119185 BLAKE2B d366b83baad7e865481535a2462ceb222aadce6c90a6229e82a72bf86518b8ebb0624d8ac8b64867783d58b6e9033b942a1ccd31fd6664a2b527eac9f11ab852 SHA512 e5ecf3eafe428a188c2410d270ee9bd5afc39122e62d35747288cf85347368ab4a94190b4ff6fe687269dc19cc7b91d33be8d3e3b637741e421a2cbd83572830 +DIST buildbot-2.7.0.tar.gz 3175050 BLAKE2B 0a41eccaa4ca8df6396455049e8c09a1b2fe6cde3072da7fd3715f2769015944e8880f41dbe6750dd7b26bd863fb82f8e8d8c6540f9e1bf3ea4378f11adc973d SHA512 9946fe0b1591d51e5136d9458526918e872174afee79b5f1c333823ef1d2ddae66f017e9b57e26a2451da7ca7672720f32544c606ce5652d0825fae563779669 EBUILD buildbot-0.9.12-r1.ebuild 6444 BLAKE2B ceacfcbc66a0fb1e927cacbd456ef023145c475ff42ff64eaa603e1db295bec38cb7939bf577410234f16e3a851c2a41d99863f4efdced715e7d2ebdd015e3ed SHA512 8857547742c7ebe0f8fd5a5919a0e1cb5fcfd34cc35f6fd5c56f7305fd2db9bc72e5d805077ae3f041dd1b16d8825c69cd0062c6dd181db5d781512269266f10 EBUILD buildbot-1.1.2.ebuild 6558 BLAKE2B c20fe0973f6cec4336f3d60a2c94f71ccae7cc5cc819549bc0e84f748f307d4e2e0bc5dd864a612b6dfd4ae9b3ab3f7ca9693e407dca414882ecb1d20e15078a SHA512 477c80abc713c6e62754fae6f071eeb0401f719a72c491a3a5932be8364ccc80fb2c1fc47c8093f558974a00151b8db3bfa34f3c4a088dec75d5d59ff4e6e63a EBUILD buildbot-1.3.0.ebuild 7211 BLAKE2B 60ed79646218a10214ca297391319e5ba3f5124065883ba0e0a71cfb38eba76316554a6150c966ec83f09826430e2e83d28d1285e58dd75af731781121629549 SHA512 245c9956385d2752e5a54e880671a685d90d20f6854c4ffcb916b2d8f60b402c4490b2365f8cff2ab7c000b9e61065f142140c2a452f7cb9834b9744624179f9 -EBUILD buildbot-9999.ebuild 7211 BLAKE2B 60ed79646218a10214ca297391319e5ba3f5124065883ba0e0a71cfb38eba76316554a6150c966ec83f09826430e2e83d28d1285e58dd75af731781121629549 SHA512 245c9956385d2752e5a54e880671a685d90d20f6854c4ffcb916b2d8f60b402c4490b2365f8cff2ab7c000b9e61065f142140c2a452f7cb9834b9744624179f9 -MISC metadata.xml 1281 BLAKE2B df69e4162a683d530c69307ea6b29362ad99f6a54af5ff977f67268e580d95cfc1924fb236f61da1c2106246e42563f66c8605d0ef779952cce57e75326a3416 SHA512 b5b7d4e08078e2541ce37ce17623dec45819029081dc9108789e964c2575b5868ea27b2d5eaa13a96b038a8a667ce7ebf18df6e73fc54eeacd609f79df36b9bc +EBUILD buildbot-2.7.0.ebuild 6974 BLAKE2B 0a847a75805dd0342a55f46640c4f01f9982eefa2cc1aeb00b15c85a5bad0a958761bcc9f508f03545be943e51e2896493c590c69f50e64691480b1916413ff2 SHA512 1e63016e5593a2135c92b2072181fb714d16bc383d88d9fc9513c30ab5a60af6b2bf6d94b2f5c25bfeba31b119ff4e45ab7f5291d950fa373a03e4c1caf6f315 +EBUILD buildbot-9999.ebuild 7696 BLAKE2B 6998175d60b79660f0493080732f8fd445d11ffa38873399ad50fc05e9973201345846c05375f8d182afe3a267f562dfe862e146aa89da37437aa744e944fcde SHA512 f77d99e0733af692bf4237babfbe6a4abefdb281c116a1e6113261b441bc9bec993bcce0d79208a0a8a05bee6b5a832335e635afa2513d15239c3514d92c5649 +MISC metadata.xml 1359 BLAKE2B 33a6b0f21ad4255f28bc527fb18a384889eb34b2ddc5df5cfa03cc4b1960712b91c787706b95913154300b8e82a5879703dd90d0bf4d796cd6b8bb2a7c4b71cd SHA512 ded6f9cd25bef2df1431b71d5ffc9f0aa3efe9d2f7433cee7800fc27e1f6f76ad64cda9bbc4d3eb3fe0f44dbd7414c75b029f78307925dab5ed06df3d52d86e7 diff --git a/dev-util/buildbot/buildbot-2.7.0.ebuild b/dev-util/buildbot/buildbot-2.7.0.ebuild new file mode 100644 index 000000000000..01fd9b609492 --- /dev/null +++ b/dev-util/buildbot/buildbot-2.7.0.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_REQ_USE="sqlite" +PYTHON_COMPAT=( python3_{6,7,8} ) + +EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" + +DISTUTILS_USE_SETUPTOOLS="rdepend" + +[[ ${PV} == *9999 ]] && inherit git-r3 +inherit readme.gentoo-r1 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.org/project/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 ~amd64-linux ~x86-linux" +fi + +IUSE="crypt docker examples irc test" +RESTRICT="!test? ( test )" + +RDEPEND=" + acct-user/buildbot + >=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/pyyaml[${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-2.9[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + ) + irc? ( + dev-python/txrequests[${PYTHON_USEDEP}] + ) + docker? ( + >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ) +" +DEPEND="${RDEPEND} + test? ( + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + dev-python/moto[${PYTHON_USEDEP}] + >=dev-python/boto3-1.12.48[${PYTHON_USEDEP}] + dev-python/parameterized[${PYTHON_USEDEP}] + dev-python/pypugjs[${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-pkg-${PV}[${PYTHON_USEDEP}] + ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] + ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] + crypt? ( + >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] + >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] + <dev-python/idna-2.9[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + ) + )" + +S=${WORKDIR}/${MY_P} +[[ ${PV} == *9999 ]] && S=${S}/master + +if [[ ${PV} != *9999 ]]; then + PATCHES=( + "${FILESDIR}/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch" + "${FILESDIR}/pypugjs.patch" + ) +fi + +distutils_enable_tests setup.py + +pkg_setup() { + 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_install() { + distutils-r1_src_install + + doman docs/buildbot.1 + + 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 +} + +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: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}" + 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 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 d59c41b23e9b..35a2e69c15ec 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-9999.ebuild @@ -1,14 +1,16 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" +DISTUTILS_USE_SETUPTOOLS="rdepend" + [[ ${PV} == *9999 ]] && inherit git-r3 -inherit readme.gentoo-r1 user systemd distutils-r1 +inherit readme.gentoo-r1 systemd distutils-r1 MY_PV="${PV/_p/.post}" MY_P="${PN}-${MY_PV}" @@ -29,6 +31,7 @@ IUSE="crypt doc docker examples irc test" RESTRICT="!test? ( test )" RDEPEND=" + acct-user/buildbot >=dev-python/jinja-2.1[${PYTHON_USEDEP}] >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] @@ -38,12 +41,13 @@ RDEPEND=" >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] dev-python/pyjwt[${PYTHON_USEDEP}] + dev-python/pyyaml[${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/idna-2.9[${PYTHON_USEDEP}] dev-python/service_identity[${PYTHON_USEDEP}] ) irc? ( @@ -51,46 +55,55 @@ RDEPEND=" ) docker? ( >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] ) " DEPEND="${RDEPEND} - >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] doc? ( >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] + <dev-python/sphinx-2.1.0[${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/docutils-0.13.0[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] dev-python/sphinx-jinja[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] ) test? ( - >=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/pyjade[${PYTHON_USEDEP}] - dev-python/txgithub[${PYTHON_USEDEP}] + >=dev-python/boto3-1.12.48[${PYTHON_USEDEP}] + dev-python/parameterized[${PYTHON_USEDEP}] + dev-python/pypugjs[${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-pkg-${PV}[${PYTHON_USEDEP}] ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] - >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] + ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] + crypt? ( + >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] + >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] + <dev-python/idna-2.9[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + ) )" +# >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] S=${WORKDIR}/${MY_P} [[ ${PV} == *9999 ]] && S=${S}/master if [[ ${PV} != *9999 ]]; then PATCHES=( - "${FILESDIR}/Remove-distro-version-test.patch" + "${FILESDIR}/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch" + "${FILESDIR}/pypugjs.patch" ) fi -pkg_setup() { - enewuser buildbot +distutils_enable_tests setup.py +pkg_setup() { 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. @@ -115,7 +128,7 @@ src_install() { doman docs/buildbot.1 if use doc; then - dohtml -r docs/_build/html/ + HTML_DOCS=( docs/_build/html/ ) # TODO: install man pages fi @@ -133,12 +146,6 @@ src_install() { readme.gentoo_create_doc } -python_test() { - distutils_install_for_testing - - esetup.py test || die "Tests failed under ${EPYTHON}" -} - pkg_postinst() { readme.gentoo_print_elog @@ -194,7 +201,7 @@ pkg_config() { 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" + chown --recursive buildbot: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}" \ @@ -202,6 +209,8 @@ pkg_config() { 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" diff --git a/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch b/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch new file mode 100644 index 000000000000..16fc0a133e10 --- /dev/null +++ b/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch @@ -0,0 +1,26 @@ +From f8d6fe39570a698d80d821a440219f5cd79d8314 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec <dolsen@gentoo.org> +Date: Tue, 5 Mar 2019 11:21:14 -0800 +Subject: [PATCH] test_buildbot_net_usage.py: Add "gentoo" to the VERSION_ID check exclusion + +Make the exclusions test into a list (slight speed improvement, easier to extend) and add "gentoo". + +Signed-off-by: Brian Dolbec <dolsen@gentoo.org> +--- + buildbot/test/unit/test_buildbot_net_usage_data.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/buildbot/test/unit/test_buildbot_net_usage_data.py b/buildbot/test/unit/test_buildbot_net_usage_data.py +index c347956..e422c55 100644 +--- a/buildbot/test/unit/test_buildbot_net_usage_data.py ++++ b/buildbot/test/unit/test_buildbot_net_usage_data.py +@@ -150,5 +150,5 @@ class Tests(unittest.TestCase): + self.assertEqual(len(distro), 2) + self.assertNotIn("unknown", distro[0]) + # Rolling distributions like Arch Linux (arch) does not have VERSION_ID +- if distro[0] != "arch": ++ if distro[0] not in ["arch", "gentoo"]: + self.assertNotIn("unknown", distro[1]) +-- +libgit2 0.99.0 + diff --git a/dev-util/buildbot/files/pypugjs.patch b/dev-util/buildbot/files/pypugjs.patch new file mode 100644 index 000000000000..3ac99502b5d5 --- /dev/null +++ b/dev-util/buildbot/files/pypugjs.patch @@ -0,0 +1,84 @@ +From 26fefa8f8fa7b347e1c86723194de3a4094dc012 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec <dolsen@gentoo.org> +Date: Sat, 25 Apr 2020 11:53:06 -0700 +Subject: [PATCH] Initial pyjade port to pypugjs + +--- + common/code_spelling_ignore_words.txt | 1 + + master/buildbot/test/unit/test_www_config.py | 8 ++++---- + master/buildbot/www/config.py | 10 +++++----- + master/docs/manual/configuration/www.rst | 10 ++++++---- + master/docs/spelling_wordlist.txt | 2 +- + master/setup.py | 4 ++-- + requirements-ci.txt | 2 +- + 7 files changed, 20 insertions(+), 17 deletions(-) + +diff --git a/buildbot/test/unit/test_www_config.py b/buildbot/test/unit/test_www_config.py +index 23a108e..a8c24ec 100644 +--- a/buildbot/test/unit/test_www_config.py ++++ b/buildbot/test/unit/test_www_config.py +@@ -107,10 +107,10 @@ class IndexResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase): + def test_parseCustomTemplateDir(self): + exp = {'views/builds.html': '<div>\n</div>'} + try: +- # we make the test work if pyjade is present or note +- # It is better than just skip if pyjade is not there +- import pyjade # pylint: disable=import-outside-toplevel +- [pyjade] ++ # we make the test work if pypugjs is present or note ++ # It is better than just skip if pypugjs is not there ++ import pypugjs # pylint: disable=import-outside-toplevel ++ [pypugjs] + exp.update({'plugin/views/plugin.html': + '<div class="myclass"><pre>this is customized</pre></div>'}) + except ImportError: +diff --git a/buildbot/www/config.py b/buildbot/www/config.py +index a021299..50bae4d 100644 +--- config.py 2020-02-27 13:34:10.000000000 -0800 ++++ config2.py 2020-05-11 17:26:44.587026761 -0700 +@@ -61,12 +61,12 @@ + res = {} + allowed_ext = [".html"] + try: +- import pyjade # pylint: disable=import-outside-toplevel ++ import pypugjs # pylint: disable=import-outside-toplevel + allowed_ext.append(".jade") + except ImportError: # pragma: no cover +- log.msg("pyjade not installed. Ignoring .jade files from %s" % ++ log.msg("pypugjs not installed. Ignoring .jade files from %s" % + (template_dir,)) +- pyjade = None ++ pypugjs = None + for root, dirs, files in os.walk(template_dir): + if root == template_dir: + template_name = posixpath.join("views", "%s.html") +@@ -86,9 +86,9 @@ + elif ext == ".jade": + with open(fn) as f: + jade = f.read() +- parser = pyjade.parser.Parser(jade) ++ parser = pypugjs.parser.Parser(jade) + block = parser.parse() +- compiler = pyjade.ext.html.Compiler( ++ compiler = pypugjs.ext.html.Compiler( + block, pretty=False) + html = compiler.compile() + res[template_name % (basename,)] = html +diff --git a/setup.py b/master/setup.py +index 8fca506..1f32a74 100755 +--- a/setup.py ++++ b/setup.py +@@ -490,8 +490,8 @@ test_deps = [ + # http client libraries + 'treq', + 'txrequests', +- # pyjade required for custom templates tests +- 'pyjade', ++ # pypugjs required for custom templates tests ++ 'pypugjs', + # boto3 and moto required for running EC2 tests + 'boto3', + 'moto', +-- +libgit2 0.99.0 + diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml index 16f4ac623ef9..45ebb49fa835 100644 --- a/dev-util/buildbot/metadata.xml +++ b/dev-util/buildbot/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>dolsen@gentoo.org</email> + <name>Brian Dolbec</name> + </maintainer> <longdescription lang="en"> BuildBot is a system to automate the compile/test cycle required by most software projects to validate code changes. |