--- devel/buildbot/Makefile (revision 435892) +++ devel/buildbot/Makefile (working copy) @@ -2,26 +2,30 @@ # $FreeBSD$ PORTNAME= buildbot -PORTVERSION= 0.8.12 -PORTREVISION= 1 +PORTVERSION= 0.9.4 CATEGORIES= devel python MASTER_SITES= CHEESESHOP -MAINTAINER= koobs@FreeBSD.org +MAINTAINER= grembo@FreeBSD.org COMMENT= Continuous Integration Framework (Master) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=11.0.0:devel/py-twisted \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2 \ + ${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ + ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \ + ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0:www/py-pyjwt \ + ${PYTHON_PKGNAMEPREFIX}ramlfications>0:devel/py-ramlfications \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 TEST_DEPENDS= trial:devel/py-twisted \ + buildbot-worker>=0.9.4:devel/buildbot-worker \ ${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \ + ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \ ${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests USES= python:-2.7 --- devel/buildbot/distinfo (revision 435892) +++ devel/buildbot/distinfo (working copy) @@ -1,2 +1,5 @@ -SHA256 (buildbot-0.8.12.tar.gz) = c6b66976dff712268566574d57131ec15e5682f6d4390cd5c8559bab0980c4d6 -SIZE (buildbot-0.8.12.tar.gz) = 4834352 +TIMESTAMP = 1488903232 +SHA256 (buildbot-0.9.4.tar.gz) = 068161cd9ada10b87f40117c768a37ce796ebf5e7bf08f224f4c7ded88cd7472 +SIZE (buildbot-0.9.4.tar.gz) = 3020851 +SHA256 (buildbot-www-0.9.4.tar.gz) = eb2f48aabee5e840aa8a4fce1f95f2fe4e2ae98045f9465d275ee5e263ae04b3 +SIZE (buildbot-www-0.9.4.tar.gz) = 691706 --- devel/buildbot/files/patch-buildbot-scripts-sample.cfg (nonexistent) +++ devel/buildbot/files/patch-buildbot-scripts-sample.cfg (working copy) @@ -0,0 +1,23 @@ +--- buildbot/scripts/sample.cfg~ 2017-01-11 14:05:29.000000000 +0100 ++++ buildbot/scripts/sample.cfg 2017-03-07 18:01:36.617128988 +0100 +@@ -10,6 +10,9 @@ + # a shorter alias to save typing. + c = BuildmasterConfig = {} + ++####### DON'T SEND USAGE DATA TO BUILDBOT.NET ++c['buildbotNetUsageData'] = None ++ + ####### WORKERS + + # The 'workers' list defines the set of recognized workers. Each element is +@@ -92,8 +95,8 @@ + c['buildbotURL'] = "http://localhost:8010/" + + # minimalistic config to activate new web UI +-c['www'] = dict(port=8010, +- plugins=dict(waterfall_view={}, console_view={})) ++#c['www'] = dict(port=8010, ++# plugins=dict(waterfall_view={}, console_view={})) + + ####### DB URL + --- devel/buildbot-console-view/Makefile (nonexistent) +++ devel/buildbot-console-view/Makefile (working copy) @@ -0,0 +1,36 @@ +# Created by: Michael Gmelin +# $FreeBSD$ + +PORTNAME= buildbot-console-view +PORTVERSION= 0.9.4 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP + +MAINTAINER= grembo@FreeBSD.org +COMMENT= Continuous Integration Framework (Console View) + +LICENSE= GPLv2 + +BUILD_DEPENDS= buildbot-pkg>=0.9.4:devel/buildbot-pkg +RUN_DEPENDS= ${BUILD_DEPENDS} +TEST_DEPENDS= trial:devel/py-twisted \ + buildbot-worker>=0.9.4:devel/buildbot-worker \ + ${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \ + ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \ + ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \ + ${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests + +USES= python:-2.7 +USE_PYTHON= autoplist distutils + +NO_ARCH= yes + +post-patch: + @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 ${REINPLACE_CMD} -e \ + 's|/usr/bin/python|${PYTHON_CMD}|g' + @${FIND} ${WRKSRC} -name \*.bak -delete + +do-test: + @cd ${WRKSRC} && trial buildbot + +.include --- devel/buildbot-console-view/distinfo (nonexistent) +++ devel/buildbot-console-view/distinfo (working copy) @@ -0,0 +1,3 @@ +TIMESTAMP = 1488906561 +SHA256 (buildbot-console-view-0.9.4.tar.gz) = 16d1ab8801439d50d712883ab155530840588d4d77ab600299ead0ef23da5bf0 +SIZE (buildbot-console-view-0.9.4.tar.gz) = 631510 --- devel/buildbot-console-view/pkg-descr (nonexistent) +++ devel/buildbot-console-view/pkg-descr (working copy) @@ -0,0 +1,6 @@ +This port is the Console View Plugin for BuildBot. For the buildmaster, install the +devel/buildbot port + +For more information, please see: http://buildbot.net/trac + +WWW: http://buildbot.net --- devel/buildbot-pkg/Makefile (nonexistent) +++ devel/buildbot-pkg/Makefile (working copy) @@ -0,0 +1,46 @@ +# Created by: Michael Gmelin +# $FreeBSD$ + +PORTNAME= buildbot-pkg +PORTVERSION= 0.9.4 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP + +MAINTAINER= grembo@FreeBSD.org +COMMENT= Continuous Integration Framework (packaging) + +LICENSE= GPLv2 + +BUILD_DEPENDS= buildbot>=0.9.4:devel/buildbot +RUN_DEPENDS= ${BUILD_DEPENDS} + +#RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted \ +# ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2 \ +# ${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn \ +# ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ +# ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \ +# ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0:www/py-pyjwt \ +# ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate \ +# ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10 \ +# ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +TEST_DEPENDS= trial:devel/py-twisted \ + buildbot-worker>=0.9.4:devel/buildbot-worker \ + ${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \ + ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \ + ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \ + ${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests + +USES= python:-2.7 +USE_PYTHON= autoplist distutils + +NO_ARCH= yes + +post-patch: + @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 ${REINPLACE_CMD} -e \ + 's|/usr/bin/python|${PYTHON_CMD}|g' + @${FIND} ${WRKSRC} -name \*.bak -delete + +do-test: + @cd ${WRKSRC} && trial buildbot + +.include --- devel/buildbot-pkg/distinfo (nonexistent) +++ devel/buildbot-pkg/distinfo (working copy) @@ -0,0 +1,3 @@ +TIMESTAMP = 1488904370 +SHA256 (buildbot-pkg-0.9.4.tar.gz) = 968f252f0700fbbcc6cac9f3fcf66d06bd577db5bf793fb3d7c84158f4f64325 +SIZE (buildbot-pkg-0.9.4.tar.gz) = 3830 --- devel/buildbot-pkg/pkg-descr (nonexistent) +++ devel/buildbot-pkg/pkg-descr (working copy) @@ -0,0 +1,6 @@ +This port is the Web UI part of BuildBot. For the buildmaster, install the +devel/buildbot port + +For more information, please see: http://buildbot.net/trac + +WWW: http://buildbot.net --- devel/buildbot-waterfall-view/Makefile (nonexistent) +++ devel/buildbot-waterfall-view/Makefile (working copy) @@ -0,0 +1,36 @@ +# Created by: Michael Gmelin +# $FreeBSD$ + +PORTNAME= buildbot-waterfall-view +PORTVERSION= 0.9.4 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP + +MAINTAINER= grembo@FreeBSD.org +COMMENT= Continuous Integration Framework (Waterfall View) + +LICENSE= GPLv2 + +BUILD_DEPENDS= buildbot-pkg>=0.9.4:devel/buildbot-pkg +RUN_DEPENDS= ${BUILD_DEPENDS} +TEST_DEPENDS= trial:devel/py-twisted \ + buildbot-worker>=0.9.4:devel/buildbot-worker \ + ${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \ + ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \ + ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \ + ${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests + +USES= python:-2.7 +USE_PYTHON= autoplist distutils + +NO_ARCH= yes + +post-patch: + @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 ${REINPLACE_CMD} -e \ + 's|/usr/bin/python|${PYTHON_CMD}|g' + @${FIND} ${WRKSRC} -name \*.bak -delete + +do-test: + @cd ${WRKSRC} && trial buildbot + +.include --- devel/buildbot-waterfall-view/distinfo (nonexistent) +++ devel/buildbot-waterfall-view/distinfo (working copy) @@ -0,0 +1,3 @@ +TIMESTAMP = 1488906879 +SHA256 (buildbot-waterfall-view-0.9.4.tar.gz) = 4e8e8d85a77a95fb6ec6e9b0eaa4a774f80cbc6f3a6568f8525d4c90f336b69f +SIZE (buildbot-waterfall-view-0.9.4.tar.gz) = 705483 --- devel/buildbot-waterfall-view/pkg-descr (nonexistent) +++ devel/buildbot-waterfall-view/pkg-descr (working copy) @@ -0,0 +1,6 @@ +This port is the Waterfall View Plugin for BuildBot. For the buildmaster, install the +devel/buildbot port + +For more information, please see: http://buildbot.net/trac + +WWW: http://buildbot.net --- devel/buildbot-worker/Makefile (nonexistent) +++ devel/buildbot-worker/Makefile (working copy) @@ -0,0 +1,38 @@ +# Created by: Frederic Praca +# $FreeBSD$ + +PORTNAME= buildbot-worker +PORTVERSION= 0.9.4 +PORTREVISION= 3 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP + +MAINTAINER= grembo@FreeBSD.org +COMMENT= Continuous Integration Framework (Worker) + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \ + ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted + +TEST_DEPENDS= trial:devel/py-twisted \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock + +USES= python:-2.7 +USE_PYTHON= autoplist distutils +USE_RC_SUBR= buildbot-worker + +SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} + +NO_ARCH= yes + +PLIST_FILES= man/man1/buildbot-worker.1.gz + +post-install: + ${INSTALL_MAN} ${WRKSRC}/docs/buildbot-worker.1 ${STAGEDIR}${MANPREFIX}/man/man1 + +do-test: + @cd ${WRKSRC} && trial buildbot_worker.test + +.include --- devel/buildbot-worker/distinfo (nonexistent) +++ devel/buildbot-worker/distinfo (working copy) @@ -0,0 +1,3 @@ +TIMESTAMP = 1488896679 +SHA256 (buildbot-worker-0.9.4.tar.gz) = 129e0d3fa9ee34f0f227487b6d1645820d2d4853099a1b0aed56587d3acab965 +SIZE (buildbot-worker-0.9.4.tar.gz) = 100889 --- devel/buildbot-worker/files/buildbot-worker.in (nonexistent) +++ devel/buildbot-worker/files/buildbot-worker.in (working copy) @@ -0,0 +1,121 @@ +#!/bin/sh + +# $FreeBSD$ +# PROVIDE: buildbot-worker +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf to run buildbot-worker: +# +# buildbot_worker_enable (bool): Set to "YES" to enable buildbot-worker. +# Default: "NO" +# +# buildbot_worker_flags (flags): Set extra command flags here. See buildbot-worker(8) +# Default: Empty (""). +# +# buildbot_worker_uid (user): User to run buildbot-worker as. +# Default: "buildbot" +# +# buildbot_worker_gid (group): Group to run buildbot-worker as. +# Default: "buildbot" +# +# buildbot_worker_basedir (path): Location for buildbot-worker base directory +# Default: %%PREFIX%%/etc/buildbot-worker +# +# buildbot_worker_profiles (str): Define profiles names. Space-delimited. +# Default: Empty ("") +# +# This rc.d script supports multiple "profiles". When profiles are +# specified, the non-profile specific parameters become defaults. +# +# Example: +# +# buildbot_worker_profiles="foo bar" +# +# buildbot_worker_foo_enable="YES" +# buildbot_worker_foo_basedir="/usr/home/foo/buildbot" +# buildbot_worker_foo_uid="foo" +# buildbot_worker_foo_gid="foo" +# +# buildbot_worker_bar_enable="YES" +# buildbot_worker_bar_basedir="/usr/home/buildbot/" + +. /etc/rc.subr + +export PATH=${PATH}:%%LOCALBASE%%/bin + +name=buildbot-worker +desc="Buildbot Buildworker" +rcvar=buildbot_worker_enable + +load_rc_config ${name} + +# These are just the defaults, they might get overriden for a specific profile. +eval ": \${${name}_enable:=\"NO\"}" +eval ": \${${name}_flags:=\"\"}" +eval ": \${${name}_uid:=\"buildbot\"}" +eval ": \${${name}_gid:=\"buildbot\"}" +eval ": \${${name}_basedir:=\"%%PREFIX%%/etc/${name}\"}" + +command="%%PREFIX%%/bin/twistd" +command_interpreter="%%PYTHON_CMD%%" +pidfile="${buildbot_worker_basedir}/twistd.pid" + + # A specific profile is specified in the command + if [ -n "$2" ]; then + profile="$2" + # Override defaults with profile-specific values + if [ -n "${buildbot_worker_profiles}" ]; then + eval buildbot_worker_enable="\${buildbot_worker_${profile}_enable:-${buildbot_worker_enable}}" + eval buildbot_worker_flags="\${buildbot_worker_${profile}_flags:-${buildbot_worker_flags}}" + eval buildbot_worker_uid="\${buildbot_worker_${profile}_uid:-${buildbot_worker_uid}}" + eval buildbot_worker_gid="\${buildbot_worker_${profile}_gid:-${buildbot_worker_gid}}" + eval buildbot_worker_basedir="\${buildbot_worker_${profile}_basedir:-${buildbot_worker_basedir}}" + eval pidfile="\${buildbot_worker_${profile}_basedir:-${buildbot_worker_basedir}}/twistd.pid" + else + echo "%%PREFIX%%/etc/rc.d/${name}: extra argument ignored" + fi + # A specific profile is not in the command + else + # Check if any profiles are defined + if [ -n "$1" -a -n "${buildbot_worker_profiles}" ]; then + # Loop through them + for profile in ${buildbot_worker_profiles}; do + eval _enable="\${buildbot_worker_${profile}_enable}" + case "${_enable:-${buildbot_worker_enable}}" in + [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) + continue + ;; + [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + ;; + *) + if test -z "$_enable"; then + _var=buildbot_worker_enable + else + _var=buildbot_worker_"${profile}"_enable + fi + warn "Bad value" \ + "'${_enable:-${buildbot_worker_enable}}'" \ + "for ${_var}. " \ + "Profile ${profile} skipped." + continue + ;; + esac + echo "===> ${name} profile: ${profile}" + if %%PREFIX%%/etc/rc.d/${name} $1 ${profile}; then + success="${profile} ${success:-}" + else + failed="${profile} (${retcode}) ${failed:-}" + fi + done + # Exit so that non-profile rc.d is not started when there are profiles + exit 0 + fi + fi + +# run_rc_command would send ${name}_flags as parameters to $command (daemon) +# This ensures they are actually passed to fcgiwrap instead. +actual_buildbot_worker_flags="${buildbot_worker_flags}" +buildbot_worker_flags="" +command_args="--uid=${buildbot_worker_uid} --gid=${buildbot_worker_gid} --pidfile=${pidfile} --python=${buildbot_worker_basedir}/buildbot.tac ${actual_buildbot_worker_flags}" +run_rc_command "$1" --- devel/buildbot-worker/files/patch-setup.py (nonexistent) +++ devel/buildbot-worker/files/patch-setup.py (working copy) @@ -0,0 +1,12 @@ +--- setup.py.orig 2017-02-08 10:06:13.000000000 +0100 ++++ setup.py 2017-03-07 15:28:03.225761995 +0100 +@@ -104,9 +104,6 @@ + "buildbot_worker.test.unit", + "buildbot_worker.test.util", + ], +- # mention data_files, even if empty, so install_data is called and +- # VERSION gets copied +- 'data_files': [("buildbot_worker", [])], + 'cmdclass': { + 'install_data': our_install_data, + 'sdist': our_sdist --- devel/buildbot-worker/pkg-descr (nonexistent) +++ devel/buildbot-worker/pkg-descr (working copy) @@ -0,0 +1,6 @@ +This port is the worker part of BuildBot. For the buildmaster, install the +devel/buildbot port + +For more information, please see: http://buildbot.net/trac + +WWW: http://buildbot.net --- devel/buildbot-www/Makefile (nonexistent) +++ devel/buildbot-www/Makefile (working copy) @@ -0,0 +1,40 @@ +# Created by: Michael Gmelin +# $FreeBSD$ + +PORTNAME= buildbot-www +PORTVERSION= 0.9.4 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP + +MAINTAINER= grembo@FreeBSD.org +COMMENT= Continuous Integration Framework (WWW) + +LICENSE= GPLv2 + +BUILD_DEPENDS= buildbot>=0.9.4:devel/buildbot \ + buildbot-pkg>=0.9.4:devel/buildbot-pkg \ + ${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock +RUN_DEPENDS= ${BUILD_DEPENDS} \ + buildbot-console-view>=0.9.4:devel/buildbot-console-view \ + buildbot-waterfall-view>=0.9.4:devel/buildbot-waterfall-view +TEST_DEPENDS= trial:devel/py-twisted \ + buildbot-worker>=0.9.4:devel/buildbot-worker \ + ${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \ + ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \ + ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \ + ${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests + +USES= python:-2.7 +USE_PYTHON= autoplist distutils + +NO_ARCH= yes + +post-patch: + @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 ${REINPLACE_CMD} -e \ + 's|/usr/bin/python|${PYTHON_CMD}|g' + @${FIND} ${WRKSRC} -name \*.bak -delete + +do-test: + @cd ${WRKSRC} && trial buildbot + +.include --- devel/buildbot-www/distinfo (nonexistent) +++ devel/buildbot-www/distinfo (working copy) @@ -0,0 +1,3 @@ +TIMESTAMP = 1488902698 +SHA256 (buildbot-www-0.9.4.tar.gz) = eb2f48aabee5e840aa8a4fce1f95f2fe4e2ae98045f9465d275ee5e263ae04b3 +SIZE (buildbot-www-0.9.4.tar.gz) = 691706 --- devel/buildbot-www/pkg-descr (nonexistent) +++ devel/buildbot-www/pkg-descr (working copy) @@ -0,0 +1,6 @@ +This port is the Web UI part of BuildBot. For the buildmaster, install the +devel/buildbot port + +For more information, please see: http://buildbot.net/trac + +WWW: http://buildbot.net