fix: return changeset items correctly from a pipeline build

Fixes pycontribs#748 Jenkins pipeline build returns a list of changesets instead of a single changeset dict.
kaltsi · Dec 9, 2023 · 44048fa · 44048fa
1 parent 4494278
commit 44048fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/jenkinsapi/build.py b/jenkinsapi/build.py
@@ -149,8 +149,11 @@ def get_changeset_items(self):
             if "items" in self._data["changeSet"]:
                 return self._data["changeSet"]["items"]
         elif "changeSets" in self._data:
-            if "items" in self._data["changeSets"]:
-                return self._data["changeSets"]["items"]
+            changes = []
+            for change in self._data["changeSets"]:
+                if "items" in change:
+                    changes += change["items"]
+            return changes
         return []
 
     def _get_vcs(self) -> str:

diff --git a/jenkinsapi_tests/unittests/configs.py b/jenkinsapi_tests/unittests/configs.py
@@ -168,7 +168,7 @@
     "artifacts": [],
     "building": False,
     "builtOn": "localhost",
-    "changeSets": {
+    "changeSets": [{
         "items": [
             {
                 "affectedPaths": ["content/rcm/v00-rcm-xccdf.xml"],
@@ -188,7 +188,7 @@
             }
         ],
         "kind": None,
-    },
+    }],
     "culprits": [],
     "description": "Best build ever!",
     "duration": 5782,