Merge pull request #3121 from jammerful/master

Make Gerrit Change Source and Reporter PATH Aware
buildbot · Apr 19, 2017 · 3dfacb4 · 3dfacb4
2 parents 0b9229a + 8c66996
commit 3dfacb4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/master/buildbot/changes/gerritchangesource.py b/master/buildbot/changes/gerritchangesource.py
@@ -313,7 +313,7 @@ def startStreamProcess(self):
             args = args + ['-i', self.identity_file]
         self.process = reactor.spawnProcess(
             self.LocalPP(self), "ssh",
-            ["ssh"] + args + ["gerrit", "stream-events"])
+            ["ssh"] + args + ["gerrit", "stream-events"], env=None)
 
     def activate(self):
         self.wantProcess = True

diff --git a/master/buildbot/newsfragments/gerrit_changesource_reporter.bugfix b/master/buildbot/newsfragments/gerrit_changesource_reporter.bugfix
@@ -0,0 +1 @@
+Gerrit Change Source and Reporter now use the system PATH variable to find the ssh binary.
diff --git a/master/buildbot/reporters/gerrit.py b/master/buildbot/reporters/gerrit.py
@@ -239,7 +239,7 @@ def callWithVersion(self, func):
         callback = lambda gerrit_version: self.processVersion(
             gerrit_version, func)
 
-        self.spawnProcess(self.VersionPP(callback), command[0], command)
+        self.spawnProcess(self.VersionPP(callback), command[0], command, env=None)
 
     class LocalPP(ProcessProtocol):
 
@@ -424,7 +424,7 @@ def sendCodeReview(self, project, revision, result):
 
         command.append(revision)
         command = [str(s) for s in command]
-        self.spawnProcess(self.LocalPP(self), command[0], command)
+        self.spawnProcess(self.LocalPP(self), command[0], command, env=None)
 
     def spawnProcess(self, *arg, **kw):
         reactor.spawnProcess(*arg, **kw)
diff --git a/master/buildbot/test/unit/test_reporter_gerrit.py b/master/buildbot/test/unit/test_reporter_gerrit.py
@@ -450,14 +450,14 @@ def testBuildGerritCommand(self):
         gsp.spawnProcess = lambda _, *a, **k: spawnSkipFirstArg(*a, **k)
         yield gsp.sendCodeReview("project", "revision", {"message": "bla", "labels": {'Verified': 1}})
         spawnSkipFirstArg.assert_called_once_with(
-            'ssh', ['ssh', 'user@serv', '-p', '29418', 'gerrit', 'version'])
+            'ssh', ['ssh', 'user@serv', '-p', '29418', 'gerrit', 'version'], env=None)
         gsp.processVersion("2.6", lambda: None)
         spawnSkipFirstArg = Mock()
         yield gsp.sendCodeReview("project", "revision", {"message": "bla", "labels": {'Verified': 1}})
         spawnSkipFirstArg.assert_called_once_with(
             'ssh',
             ['ssh', 'user@serv', '-p', '29418', 'gerrit', 'review',
-             '--project project', "--message 'bla'", '--label Verified=1', 'revision'])
+             '--project project', "--message 'bla'", '--label Verified=1', 'revision'], env=None)
 
         # <=2.5 uses other syntax
         gsp.processVersion("2.4", lambda: None)
@@ -466,7 +466,7 @@ def testBuildGerritCommand(self):
         spawnSkipFirstArg.assert_called_once_with(
             'ssh',
             ['ssh', 'user@serv', '-p', '29418', 'gerrit', 'review', '--project project',
-             "--message 'bla'", '--verified 1', 'revision'])
+             "--message 'bla'", '--verified 1', 'revision'], env=None)
 
         # now test the notify argument, even though _gerrit_notify
         # is private, work around that
@@ -477,7 +477,8 @@ def testBuildGerritCommand(self):
         spawnSkipFirstArg.assert_called_once_with(
             'ssh',
             ['ssh', 'user@serv', '-p', '29418', 'gerrit', 'review',
-             '--project project', '--notify OWNER', "--message 'bla'", '--label Verified=1', 'revision'])
+             '--project project', '--notify OWNER', "--message 'bla'", '--label Verified=1', 'revision'],
+            env=None)
 
         # gerrit versions <= 2.5 uses other syntax
         gsp.processVersion('2.4', lambda: None)
@@ -486,4 +487,5 @@ def testBuildGerritCommand(self):
         spawnSkipFirstArg.assert_called_once_with(
             'ssh',
             ['ssh', 'user@serv', '-p', '29418', 'gerrit', 'review', '--project project', '--notify OWNER',
-             "--message 'bla'", '--verified 1', 'revision'])
+             "--message 'bla'", '--verified 1', 'revision'],
+            env=None)