git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #57988 from lopsided98/buildbot-update

buildbot: 1.8.1 -> 2.1.0

commit6f95ac3588597a2d165f09b77dc2e607c1f286b9 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateSat 23 Mar 2019, 20:38 (8 years ago) parent04727cc69f2787
10 files changed+162−132
nixos/doc/manual/release-notes/rl-1909.xml+23 nixos/modules/services/continuous-integration/buildbot/master.nix+3−3 nixos/modules/services/continuous-integration/buildbot/worker.nix+3−3 nixos/tests/buildbot.nix+99−106 pkgs/development/python-modules/buildbot/default.nix+19−6 pkgs/development/python-modules/buildbot/pkg.nix+2−2 pkgs/development/python-modules/buildbot/plugins.nix+6−5 pkgs/development/python-modules/buildbot/worker.nix+2−2 pkgs/top-level/aliases.nix−5 pkgs/top-level/all-packages.nix+5
nixos/doc/manual/release-notes/rl-1909.xml+23
@@ -42,6 +42,29 @@
4242 </itemizedlist>
4343 </section>
4444
45+ <section xmlns="http://docbook.org/ns/docbook"
46+ xmlns:xlink="http://www.w3.org/1999/xlink"
47+ xmlns:xi="http://www.w3.org/2001/XInclude"
48+ version="5.0"
49+ xml:id="sec-release-19.09-incompatibilities">
50+ <title>Backward Incompatibilities</title>
51+
52+ <para>
53+ When upgrading from a previous release, please be aware of the following
54+ incompatible changes:
55+ </para>
56+
57+ <itemizedlist>
58+ <listitem>
59+ <para>
60+ Buildbot no longer supports Python 2, as support was dropped upstream in
61+ version 2.0.0. Configurations may need to be modified to make them
62+ compatible with Python 3.
63+ </para>
64+ </listitem>
65+ </itemizedlist>
66+ </section>
67+
4568 <section xmlns="http://docbook.org/ns/docbook"
4669 xmlns:xlink="http://www.w3.org/1999/xlink"
4770 xmlns:xi="http://www.w3.org/2001/XInclude"
nixos/modules/services/continuous-integration/buildbot/master.nix+3−3
@@ -199,10 +199,10 @@ in {
199199
200200 package = mkOption {
201201 type = types.package;
202− default = pkgs.pythonPackages.buildbot-full;
203− defaultText = "pkgs.pythonPackages.buildbot-full";
202+ default = pkgs.python3Packages.buildbot-full;
203+ defaultText = "pkgs.python3Packages.buildbot-full";
204204 description = "Package to use for buildbot.";
205− example = literalExample "pkgs.python3Packages.buildbot-full";
205+ example = literalExample "pkgs.python3Packages.buildbot";
206206 };
207207
208208 packages = mkOption {
nixos/modules/services/continuous-integration/buildbot/worker.nix+3−3
@@ -118,10 +118,10 @@ in {
118118
119119 package = mkOption {
120120 type = types.package;
121− default = pkgs.pythonPackages.buildbot-worker;
122− defaultText = "pkgs.pythonPackages.buildbot-worker";
121+ default = pkgs.python3Packages.buildbot-worker;
122+ defaultText = "pkgs.python3Packages.buildbot-worker";
123123 description = "Package to use for buildbot worker.";
124− example = literalExample "pkgs.python3Packages.buildbot-worker";
124+ example = literalExample "pkgs.python2Packages.buildbot-worker";
125125 };
126126
127127 packages = mkOption {
nixos/tests/buildbot.nix+99−106
@@ -5,116 +5,109 @@
55
66with import ../lib/testing.nix { inherit system pkgs; };
77
8−let
9− # Test ensures buildbot master comes up correctly and workers can connect
10− mkBuildbotTest = python: makeTest {
11− name = "buildbot";
12−
13− nodes = {
14− bbmaster = { pkgs, ... }: {
15− services.buildbot-master = {
16− enable = true;
17− package = python.pkgs.buildbot-full;
18−
19− # NOTE: use fake repo due to no internet in hydra ci
20− factorySteps = [
21− "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')"
22− "steps.ShellCommand(command=['bash', 'fakerepo.sh'])"
23− ];
24− changeSource = [
25− "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
26− ];
27− };
28− networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ];
29− environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-full ];
30− };
31−
32− bbworker = { pkgs, ... }: {
33− services.buildbot-worker = {
34− enable = true;
35− masterUrl = "bbmaster:9989";
36− };
37− environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-worker ];
8+# Test ensures buildbot master comes up correctly and workers can connect
9+makeTest {
10+ name = "buildbot";
11+
12+ nodes = {
13+ bbmaster = { pkgs, ... }: {
14+ services.buildbot-master = {
15+ enable = true;
16+
17+ # NOTE: use fake repo due to no internet in hydra ci
18+ factorySteps = [
19+ "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')"
20+ "steps.ShellCommand(command=['bash', 'fakerepo.sh'])"
21+ ];
22+ changeSource = [
23+ "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
24+ ];
3825 };
26+ networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ];
27+ environment.systemPackages = with pkgs; [ git python3Packages.buildbot-full ];
28+ };
3929
40− gitrepo = { pkgs, ... }: {
41− services.openssh.enable = true;
42− networking.firewall.allowedTCPPorts = [ 22 9418 ];
43− environment.systemPackages = with pkgs; [ git ];
30+ bbworker = { pkgs, ... }: {
31+ services.buildbot-worker = {
32+ enable = true;
33+ masterUrl = "bbmaster:9989";
4434 };
35+ environment.systemPackages = with pkgs; [ git python3Packages.buildbot-worker ];
4536 };
4637
47− testScript = ''
48− #Start up and populate fake repo
49− $gitrepo->waitForUnit("multi-user.target");
50− print($gitrepo->execute(" \
51− git config --global user.name 'Nobody Fakeuser' && \
52− git config --global user.email 'nobody\@fakerepo.com' && \
53− rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \
54− mkdir -pv /srv/repos/fakerepo ~/.ssh && \
55− ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \
56− cat ~/.ssh/known_hosts && \
57− cd /srv/repos/fakerepo && \
58− git init && \
59− echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \
60− cat fakerepo.sh && \
61− touch .git/git-daemon-export-ok && \
62− git add fakerepo.sh .git/git-daemon-export-ok && \
63− git commit -m fakerepo && \
64− git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \
65− "));
66−
67− # Test gitrepo
68− $bbmaster->waitForUnit("network-online.target");
69− #$bbmaster->execute("nc -z gitrepo 9418");
70− print($bbmaster->execute(" \
71− rm -rfv /tmp/fakerepo && \
72− git clone git://gitrepo/fakerepo /tmp/fakerepo && \
73− pwd && \
74− ls -la && \
75− ls -la /tmp/fakerepo \
76− "));
77−
78− # Test start master and connect worker
79− $bbmaster->waitForUnit("buildbot-master.service");
80− $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/;
81− $bbworker->waitForUnit("network-online.target");
82− $bbworker->execute("nc -z bbmaster 8010");
83− $bbworker->execute("nc -z bbmaster 9989");
84− $bbworker->waitForUnit("buildbot-worker.service");
85− print($bbworker->execute("ls -la /home/bbworker/worker"));
86−
87−
88− # Test stop buildbot master and worker
89− print($bbmaster->execute(" \
90− systemctl -l --no-pager status buildbot-master && \
91− systemctl stop buildbot-master \
92− "));
93− $bbworker->fail("nc -z bbmaster 8010");
94− $bbworker->fail("nc -z bbmaster 9989");
95− print($bbworker->execute(" \
96− systemctl -l --no-pager status buildbot-worker && \
97− systemctl stop buildbot-worker && \
98− ls -la /home/bbworker/worker \
99− "));
100−
101−
102− # Test buildbot daemon mode
103− $bbmaster->execute("buildbot create-master /tmp");
104− $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg");
105− $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg");
106− $bbmaster->execute("buildbot start /tmp");
107− $bbworker->execute("nc -z bbmaster 8011");
108− $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/;
109− $bbmaster->execute("buildbot stop /tmp");
110− $bbworker->fail("nc -z bbmaster 8011");
111−
112− '';
113−
114− meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ];
115−
38+ gitrepo = { pkgs, ... }: {
39+ services.openssh.enable = true;
40+ networking.firewall.allowedTCPPorts = [ 22 9418 ];
41+ environment.systemPackages = with pkgs; [ git ];
42+ };
11643 };
117−in {
118− python2 = mkBuildbotTest pkgs.python2;
119− python3 = mkBuildbotTest pkgs.python3;
44+
45+ testScript = ''
46+ #Start up and populate fake repo
47+ $gitrepo->waitForUnit("multi-user.target");
48+ print($gitrepo->execute(" \
49+ git config --global user.name 'Nobody Fakeuser' && \
50+ git config --global user.email 'nobody\@fakerepo.com' && \
51+ rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \
52+ mkdir -pv /srv/repos/fakerepo ~/.ssh && \
53+ ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \
54+ cat ~/.ssh/known_hosts && \
55+ cd /srv/repos/fakerepo && \
56+ git init && \
57+ echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \
58+ cat fakerepo.sh && \
59+ touch .git/git-daemon-export-ok && \
60+ git add fakerepo.sh .git/git-daemon-export-ok && \
61+ git commit -m fakerepo && \
62+ git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \
63+ "));
64+
65+ # Test gitrepo
66+ $bbmaster->waitForUnit("network-online.target");
67+ #$bbmaster->execute("nc -z gitrepo 9418");
68+ print($bbmaster->execute(" \
69+ rm -rfv /tmp/fakerepo && \
70+ git clone git://gitrepo/fakerepo /tmp/fakerepo && \
71+ pwd && \
72+ ls -la && \
73+ ls -la /tmp/fakerepo \
74+ "));
75+
76+ # Test start master and connect worker
77+ $bbmaster->waitForUnit("buildbot-master.service");
78+ $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/;
79+ $bbworker->waitForUnit("network-online.target");
80+ $bbworker->execute("nc -z bbmaster 8010");
81+ $bbworker->execute("nc -z bbmaster 9989");
82+ $bbworker->waitForUnit("buildbot-worker.service");
83+ print($bbworker->execute("ls -la /home/bbworker/worker"));
84+
85+
86+ # Test stop buildbot master and worker
87+ print($bbmaster->execute(" \
88+ systemctl -l --no-pager status buildbot-master && \
89+ systemctl stop buildbot-master \
90+ "));
91+ $bbworker->fail("nc -z bbmaster 8010");
92+ $bbworker->fail("nc -z bbmaster 9989");
93+ print($bbworker->execute(" \
94+ systemctl -l --no-pager status buildbot-worker && \
95+ systemctl stop buildbot-worker && \
96+ ls -la /home/bbworker/worker \
97+ "));
98+
99+
100+ # Test buildbot daemon mode
101+ $bbmaster->execute("buildbot create-master /tmp");
102+ $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg");
103+ $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg");
104+ $bbmaster->execute("buildbot start /tmp");
105+ $bbworker->execute("nc -z bbmaster 8011");
106+ $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/;
107+ $bbmaster->execute("buildbot stop /tmp");
108+ $bbworker->fail("nc -z bbmaster 8011");
109+
110+ '';
111+
112+ meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ];
120113}
pkgs/development/python-modules/buildbot/default.nix+19−6
@@ -1,8 +1,9 @@
1−{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
1+{ stdenv, lib, buildPythonPackage, /*fetchPypi,*/ fetchFromGitHub, makeWrapper, isPy3k,
22 python, twisted, jinja2, zope_interface, future, sqlalchemy,
33 sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
44 txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
5− isort, pylint, flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
5+ isort, pylint, flake8, buildbot-worker, buildbot-pkg, parameterized,
6+ glibcLocales }:
67
78let
89 withPlugins = plugins: buildPythonPackage {
@@ -24,12 +25,21 @@ let
2425
2526 package = buildPythonPackage rec {
2627 pname = "buildbot";
27− version = "1.8.1";
28+ version = "2.1.0";
2829
29− src = fetchPypi {
30+ /*src = fetchPypi {
3031 inherit pname version;
31− sha256 = "1zadmyrlk7p9h1akmbzwa7p90s7jwsxvdx4xn9i54dnda450m3a7";
32− };
32+ sha256 = "1745hj9s0c0fcdjv6w05bma76xqg1fv42v0dslmi4d8yz9phf37w";
33+ };*/
34+ # Temporarily use GitHub source because PyPi archive is missing some files
35+ # needed for the tests to pass. This has been fixed upstream.
36+ # See: https://github.com/buildbot/buildbot/commit/30f5927cf9a80f98ed909241a149469dec3ce68d
37+ src = fetchFromGitHub {
38+ owner = "buildbot";
39+ repo = "buildbot";
40+ rev = "v${version}";
41+ sha256 = "022ybhdvp0hp2z0cwgx7n41jyh56bpxj3fwm4z7ppzj1qhm7lb65";
42+ } + "/master";
3343
3444 propagatedBuildInputs = [
3545 # core
@@ -63,6 +73,7 @@ let
6373 flake8
6474 buildbot-worker
6575 buildbot-pkg
76+ parameterized
6677 glibcLocales
6778 ];
6879
@@ -84,6 +95,8 @@ let
8495 export PATH="$out/bin:$PATH"
8596 '';
8697
98+ disabled = !isPy3k;
99+
87100 passthru = {
88101 inherit withPlugins;
89102 };
pkgs/development/python-modules/buildbot/pkg.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "buildbot-pkg";
5− version = "1.8.1";
5+ version = "2.1.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "16gjdzkris6475bvsgvb0v6rkn4xb6f55s468q37n0l1r6n8snc3";
9+ sha256 = "03lv97q4pp2izjfbwfv4zmf2fyiz7jyp537bi3gc6rhfbrfgib1i";
1010 };
1111
1212 postPatch = ''
pkgs/development/python-modules/buildbot/plugins.nix+6−5
@@ -10,7 +10,8 @@
1010
1111 src = fetchPypi {
1212 inherit pname version format;
13− sha256 = "03cgjhwpgbm0qgis1cdy9g4vc11hsrya9grcx4j35784rny7lbfl";
13+ python = "py3";
14+ sha256 = "011sagw8zp1z12vzkxi44w3w2lbxncz5yahkrbxj8hp6iwfzfm5v";
1415 };
1516
1617 meta = with lib; {
@@ -27,7 +28,7 @@
2728
2829 src = fetchPypi {
2930 inherit pname version;
30− sha256 = "0pfp2n4ys99jglshdrp2f6jm73c4ym3dfwl6qjvbc7y7nsi74824";
31+ sha256 = "11gz4ry1law3l64ii383cj5fnbw9409czp2ybzkqafr4xi1qbk9h";
3132 };
3233
3334 propagatedBuildInputs = [ buildbot-pkg ];
@@ -47,7 +48,7 @@
4748
4849 src = fetchPypi {
4950 inherit pname version;
50− sha256 = "0gnxq9niw64q36dm917lhhcl8zp0wjwaamjp07zidnrb5c3pjbsz";
51+ sha256 = "0w4iwpj1rg20fbli0ppqz70l1mc9ilg0crq8g3xrf29f9z8d1w27";
5152 };
5253
5354 propagatedBuildInputs = [ buildbot-pkg ];
@@ -67,7 +68,7 @@
6768
6869 src = fetchPypi {
6970 inherit pname version;
70− sha256 = "1b06aa8m1pzqq2d8imrq5mazc7llrlbgm7jzi8h6jjd2gahdjgz5";
71+ sha256 = "0xyvxamw45qhnfml3x5hfg9nai1jhdwbmq4pm8csf3ad0cw6vqya";
7172 };
7273
7374 propagatedBuildInputs = [ buildbot-pkg ];
@@ -87,7 +88,7 @@
8788
8889 src = fetchPypi {
8990 inherit pname version;
90− sha256 = "1v8411bw0cs206vwfnqx1na7dzg77h9aff4wlm11hkbdsy9ayv2d";
91+ sha256 = "1szcrx8vslskifzxaq7lrfg2arilaq1w1aqr0nc8pjclj7idp92c";
9192 };
9293
9394 propagatedBuildInputs = [ buildbot-pkg ];
pkgs/development/python-modules/buildbot/worker.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage (rec {
44 pname = "buildbot-worker";
5− version = "1.8.1";
5+ version = "2.1.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1rh73jbyms4b9wgkkdzcn80xfd18p8rn89rw4rsi2002ydrc7n39";
9+ sha256 = "14qimaf513h2hklcpix8vscrawvr1qiyn1vy88ycpsbz9mcqbhps";
1010 };
1111
1212 propagatedBuildInputs = [ twisted future ];
pkgs/top-level/aliases.nix−5
@@ -49,11 +49,6 @@ mapAliases ({
4949 bashCompletion = bash-completion; # Added 2016-09-28
5050 bridge_utils = bridge-utils; # added 2015-02-20
5151 btrfsProgs = btrfs-progs; # added 2016-01-03
52− buildbot = pythonPackages.buildbot; # added 2018-10-11
53− buildbot-full = pythonPackages.buildbot-full; # added 2018-10-11
54− buildbot-pkg = pythonPackages.buildbot-pkg; # added 2018-10-11
55− buildbot-ui = pythonPackages.buildbot-ui; # added 2018-10-11
56− buildbot-worker = pythonPackages.buildbot-worker; # added 2018-10-11
5752 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
5853 bundler_HEAD = bundler; # added 2015-11-15
5954 cantarell_fonts = cantarell-fonts; # added 2018-03-03
pkgs/top-level/all-packages.nix+5
@@ -673,6 +673,11 @@ in
673673
674674 bonfire = callPackage ../tools/misc/bonfire { };
675675
676+ buildbot = with python3Packages; toPythonApplication buildbot;
677+ buildbot-ui = with python3Packages; toPythonApplication buildbot-ui;
678+ buildbot-full = with python3Packages; toPythonApplication buildbot-full;
679+ buildbot-worker = with python3Packages; toPythonApplication buildbot-worker;
680+
676681 bunny = callPackage ../tools/package-management/bunny { };
677682
678683 chezmoi = callPackage ../tools/misc/chezmoi { };