Merge pull request #5512 from p12tic/2.8-fix-codebase-None-assertion

2.8: Fix incomplete codebase support in Gerrit
buildbot · Aug 29, 2020 · 42c077b · 42c077b
2 parents 5e9c0b1 + e91beab
commit 42c077b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/master/buildbot/changes/gerritchangesource.py b/master/buildbot/changes/gerritchangesource.py
@@ -171,6 +171,7 @@ def addChange(self, chdict):
             "patch_comment": chdict["comments"],
             "repository": chdict["repository"],
             "project": chdict["project"],
+            "codebase": '',
         }
 
         stampid, found_existing = yield(

diff --git a/master/buildbot/newsfragments/handle-default-codebase-in-gerrit.bugfix b/master/buildbot/newsfragments/handle-default-codebase-in-gerrit.bugfix
@@ -0,0 +1,2 @@
+Work around incomplete support for codebases in GerritChangeSource (:issue:`5190`). This avoids an internal assertion when the configuration file does not specify any codebases.
+
diff --git a/master/buildbot/test/fakedb/sourcestamps.py b/master/buildbot/test/fakedb/sourcestamps.py
@@ -98,6 +98,11 @@ def findOrCreateId(self, branch=None, revision=None, repository=None,
                        patch_body=None, patch_level=None,
                        patch_author=None, patch_comment=None,
                        patch_subdir=None):
+
+        assert codebase is not None, "codebase cannot be None"
+        assert project is not None, "project cannot be None"
+        assert repository is not None, "repository cannot be None"
+
         if patch_body:
             patchid = len(self.patches) + 1
             while patchid in self.patches:

diff --git a/master/buildbot/test/integration/test_custom_buildstep.py b/master/buildbot/test/integration/test_custom_buildstep.py
@@ -194,9 +194,13 @@ def setUp(self):
         yield wfb.attached(self.worker, {})
 
         # add the buildset/request
-        self.bsid, brids = yield self.master.db.buildsets.addBuildset(
-            sourcestamps=[{}], reason='x', properties={},
-            builderids=[80], waited_for=False)
+        sourcestamps = [
+            {'repository': '', 'project': '', 'codebase': ''}
+        ]
+        self.bsid, brids = yield self.master.db.buildsets.addBuildset(sourcestamps=sourcestamps,
+                                                                      reason='x', properties={},
+                                                                      builderids=[80],
+                                                                      waited_for=False)
 
         self.brdict = \
             yield self.master.db.buildrequests.getBuildRequest(brids[80])