Merge pull request #57988 from lopsided98/buildbot-update

buildbot: 1.8.1 -> 2.1.0

4 files changed, 128 insertions, 112 deletions

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index cc0d97023f96..b8cb83113266 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -46,6 +46,29 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
+         xml:id="sec-release-19.09-incompatibilities">
+  <title>Backward Incompatibilities</title>
+
+  <para>
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
+  </para>
+
+  <itemizedlist>
+   <listitem>
+    <para>
+     Buildbot no longer supports Python 2, as support was dropped upstream in
+     version 2.0.0. Configurations may need to be modified to make them
+     compatible with Python 3.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
+
+ <section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
          xml:id="sec-release-19.09-notable-changes">
   <title>Other Notable Changes</title>
 
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index 0f07e6133bb5..9c615fbe885f 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -199,10 +199,10 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.pythonPackages.buildbot-full;
-        defaultText = "pkgs.pythonPackages.buildbot-full";
+        default = pkgs.python3Packages.buildbot-full;
+        defaultText = "pkgs.python3Packages.buildbot-full";
         description = "Package to use for buildbot.";
-        example = literalExample "pkgs.python3Packages.buildbot-full";
+        example = literalExample "pkgs.python3Packages.buildbot";
       };
 
       packages = mkOption {
diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix
index 4130ec918a70..49e04ca36228 100644
--- a/nixos/modules/services/continuous-integration/buildbot/worker.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix
@@ -118,10 +118,10 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.pythonPackages.buildbot-worker;
-        defaultText = "pkgs.pythonPackages.buildbot-worker";
+        default = pkgs.python3Packages.buildbot-worker;
+        defaultText = "pkgs.python3Packages.buildbot-worker";
         description = "Package to use for buildbot worker.";
-        example = literalExample "pkgs.python3Packages.buildbot-worker";
+        example = literalExample "pkgs.python2Packages.buildbot-worker";
       };
 
       packages = mkOption {
diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix
index 210ad8e91df7..f5c8c4863b6f 100644
--- a/nixos/tests/buildbot.nix
+++ b/nixos/tests/buildbot.nix
@@ -5,116 +5,109 @@
 
 with import ../lib/testing.nix { inherit system pkgs; };
 
-let
-  # Test ensures buildbot master comes up correctly and workers can connect
-  mkBuildbotTest = python: makeTest {
-    name = "buildbot";
-
-    nodes = {
-      bbmaster = { pkgs, ... }: {
-        services.buildbot-master = {
-          enable = true;
-          package = python.pkgs.buildbot-full;
-
-          # NOTE: use fake repo due to no internet in hydra ci
-          factorySteps = [
-            "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')"
-            "steps.ShellCommand(command=['bash', 'fakerepo.sh'])"
-          ];
-          changeSource = [
-            "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
-          ];
-        };
-        networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ];
-        environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-full ];
-      };
-
-      bbworker = { pkgs, ... }: {
-        services.buildbot-worker = {
-          enable = true;
-          masterUrl = "bbmaster:9989";
-        };
-        environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-worker ];
+# Test ensures buildbot master comes up correctly and workers can connect
+makeTest {
+  name = "buildbot";
+
+  nodes = {
+    bbmaster = { pkgs, ... }: {
+      services.buildbot-master = {
+        enable = true;
+
+        # NOTE: use fake repo due to no internet in hydra ci
+        factorySteps = [
+          "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')"
+          "steps.ShellCommand(command=['bash', 'fakerepo.sh'])"
+        ];
+        changeSource = [
+          "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
+        ];
       };
+      networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ];
+      environment.systemPackages = with pkgs; [ git python3Packages.buildbot-full ];
+    };
 
-      gitrepo = { pkgs, ... }: {
-        services.openssh.enable = true;
-        networking.firewall.allowedTCPPorts = [ 22 9418 ];
-        environment.systemPackages = with pkgs; [ git ];
+    bbworker = { pkgs, ... }: {
+      services.buildbot-worker = {
+        enable = true;
+        masterUrl = "bbmaster:9989";
       };
+      environment.systemPackages = with pkgs; [ git python3Packages.buildbot-worker ];
     };
 
-    testScript = ''
-      #Start up and populate fake repo
-      $gitrepo->waitForUnit("multi-user.target");
-      print($gitrepo->execute(" \
-        git config --global user.name 'Nobody Fakeuser' && \
-        git config --global user.email 'nobody\@fakerepo.com' && \
-        rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \
-        mkdir -pv /srv/repos/fakerepo ~/.ssh && \
-        ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \
-        cat ~/.ssh/known_hosts && \
-        cd /srv/repos/fakerepo && \
-        git init && \
-        echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \
-        cat fakerepo.sh && \
-        touch .git/git-daemon-export-ok && \
-        git add fakerepo.sh .git/git-daemon-export-ok && \
-        git commit -m fakerepo && \
-        git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \
-      "));
-
-      # Test gitrepo
-      $bbmaster->waitForUnit("network-online.target");
-      #$bbmaster->execute("nc -z gitrepo 9418");
-      print($bbmaster->execute(" \
-        rm -rfv /tmp/fakerepo && \
-        git clone git://gitrepo/fakerepo /tmp/fakerepo && \
-        pwd && \
-        ls -la && \
-        ls -la /tmp/fakerepo \
-      "));
-
-      # Test start master and connect worker
-      $bbmaster->waitForUnit("buildbot-master.service");
-      $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/;
-      $bbworker->waitForUnit("network-online.target");
-      $bbworker->execute("nc -z bbmaster 8010");
-      $bbworker->execute("nc -z bbmaster 9989");
-      $bbworker->waitForUnit("buildbot-worker.service");
-      print($bbworker->execute("ls -la /home/bbworker/worker"));
-
-
-      # Test stop buildbot master and worker
-      print($bbmaster->execute(" \
-        systemctl -l --no-pager status buildbot-master && \
-        systemctl stop buildbot-master \
-      "));
-      $bbworker->fail("nc -z bbmaster 8010");
-      $bbworker->fail("nc -z bbmaster 9989");
-      print($bbworker->execute(" \
-        systemctl -l --no-pager status buildbot-worker && \
-        systemctl stop buildbot-worker && \
-        ls -la /home/bbworker/worker \
-      "));
-
-
-      # Test buildbot daemon mode
-      $bbmaster->execute("buildbot create-master /tmp");
-      $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg");
-      $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg");
-      $bbmaster->execute("buildbot start /tmp");
-      $bbworker->execute("nc -z bbmaster 8011");
-      $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/;
-      $bbmaster->execute("buildbot stop /tmp");
-      $bbworker->fail("nc -z bbmaster 8011");
-
-    '';
-
-    meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ];
-
+    gitrepo = { pkgs, ... }: {
+      services.openssh.enable = true;
+      networking.firewall.allowedTCPPorts = [ 22 9418 ];
+      environment.systemPackages = with pkgs; [ git ];
+    };
   };
-in {
-  python2 = mkBuildbotTest pkgs.python2;
-  python3 = mkBuildbotTest pkgs.python3;
+
+  testScript = ''
+    #Start up and populate fake repo
+    $gitrepo->waitForUnit("multi-user.target");
+    print($gitrepo->execute(" \
+      git config --global user.name 'Nobody Fakeuser' && \
+      git config --global user.email 'nobody\@fakerepo.com' && \
+      rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \
+      mkdir -pv /srv/repos/fakerepo ~/.ssh && \
+      ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \
+      cat ~/.ssh/known_hosts && \
+      cd /srv/repos/fakerepo && \
+      git init && \
+      echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \
+      cat fakerepo.sh && \
+      touch .git/git-daemon-export-ok && \
+      git add fakerepo.sh .git/git-daemon-export-ok && \
+      git commit -m fakerepo && \
+      git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \
+    "));
+
+    # Test gitrepo
+    $bbmaster->waitForUnit("network-online.target");
+    #$bbmaster->execute("nc -z gitrepo 9418");
+    print($bbmaster->execute(" \
+      rm -rfv /tmp/fakerepo && \
+      git clone git://gitrepo/fakerepo /tmp/fakerepo && \
+      pwd && \
+      ls -la && \
+      ls -la /tmp/fakerepo \
+    "));
+
+    # Test start master and connect worker
+    $bbmaster->waitForUnit("buildbot-master.service");
+    $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/;
+    $bbworker->waitForUnit("network-online.target");
+    $bbworker->execute("nc -z bbmaster 8010");
+    $bbworker->execute("nc -z bbmaster 9989");
+    $bbworker->waitForUnit("buildbot-worker.service");
+    print($bbworker->execute("ls -la /home/bbworker/worker"));
+
+
+    # Test stop buildbot master and worker
+    print($bbmaster->execute(" \
+      systemctl -l --no-pager status buildbot-master && \
+      systemctl stop buildbot-master \
+    "));
+    $bbworker->fail("nc -z bbmaster 8010");
+    $bbworker->fail("nc -z bbmaster 9989");
+    print($bbworker->execute(" \
+      systemctl -l --no-pager status buildbot-worker && \
+      systemctl stop buildbot-worker && \
+      ls -la /home/bbworker/worker \
+    "));
+
+
+    # Test buildbot daemon mode
+    $bbmaster->execute("buildbot create-master /tmp");
+    $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg");
+    $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg");
+    $bbmaster->execute("buildbot start /tmp");
+    $bbworker->execute("nc -z bbmaster 8011");
+    $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/;
+    $bbmaster->execute("buildbot stop /tmp");
+    $bbworker->fail("nc -z bbmaster 8011");
+
+  '';
+
+  meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ];
 }