checkmk-dev-tools 2.1.3__tar.gz → 2.2.0__tar.gz

{checkmk_dev_tools-2.1.3 → checkmk_dev_tools-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: checkmk-dev-tools
-Version: 2.1.3
+Version: 2.2.0
 Summary: Checkmk DevOps tools
 Author: Frans Fürst
 Author-email: frans.fuerst@checkmk.com
@@ -14,7 +14,7 @@ Requires-Dist: pydantic (>=2,<3)
 Requires-Dist: python-jenkins (>=1.8.3,<1.9.0)
 Requires-Dist: rich
 Requires-Dist: trickkiste (>=0.3.4,<0.4.0)
-Project-URL: Changelog, https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.1.3/changelog.md
+Project-URL: Changelog, https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.2.0/changelog.md
 Project-URL: Repository, https://github.com/Checkmk/checkmk-dev-tools
 Description-Content-Type: text/markdown
 

{checkmk_dev_tools-2.1.3 → checkmk_dev_tools-2.2.0}/cmk_dev/ci_artifacts.py

@@ -582,7 +582,7 @@ async def build_id_from_queue_item(
 ) -> BuildId:
     """Waits for queue item with given @queue_id to be scheduled and returns Build instance"""
     if queue_item is None:
-        queue_item = await client.queue_item(queue_id)
+        queue_item = await client.queue_item(queue_id, depth=1)
 
     log().info(
         "waiting for queue item %s to be scheduled (%s%s)",
@@ -592,7 +592,7 @@ async def build_id_from_queue_item(
     )
 
     while True:
-        queue_item = await client.queue_item(queue_id)
+        queue_item = await client.queue_item(queue_id, depth=1)
         if queue_item.executable:
             return queue_item.executable.number
         log().debug("still waiting in queue, because %s", queue_item.why)
@@ -640,9 +640,7 @@ async def find_matching_queue_item(
     """Looks for a queued build matching job and parameters and returns the QueueId"""
     log().debug("Checking queued items with the Jenkins API")
 
-    for simple_queue_item in await jenkins_client.queue_info():
-        queue_item = await jenkins_client.queue_item(simple_queue_item.id, depth=2)
-
+    for queue_item in await jenkins_client.queue_info():
         # In order to compare with `job.url` we would have to inject the jenkins base URL
         # Instead we can also strip it off from `job.url` and compare relative URLs instead
         # Instead of "https://ci.com/job/name/42/" == "https://ci.com/job/name/42/" we compare
@@ -1095,12 +1093,15 @@ async def identify_matching_build(
             f"Got {len(matching_builds)} InfluxDB job history entries of today, generated {len(builds)} builds to check"
         )
 
+        log().info("Check for matching existing builds")
         # ugly code duplication incomming, rework this to a dedicated function
         for build in list(builds.values()):
             if meets_constraints(build, params, time_constraints, path_hashes):
                 log().info("found matching (may finished) build: %s (%s)", build.number, build.url)
                 return build
+        log().info("No matching builds found in the InfluxDB")
 
+        log().info("Check for matching queue items via Jenkins API")
         if hasattr(args, "ignore_build_queue") and not args.ignore_build_queue:
             if matching_item := await find_matching_queue_item(
                 jenkins_client=jenkins_client,
@@ -1109,32 +1110,39 @@ async def identify_matching_build(
                 path_hashes=path_hashes,
                 next_check_sleep=next_check_sleep,
             ):
-                log().debug("Found matching queued item %s", matching_item)
+                log().info("Found matching queued item %s", matching_item)
                 return await jenkins_client.build_info(job.path, matching_item)
+        log().info("No matching queue items found via Jenkins API")
 
         # exit here with no matching result if
         # - the InfluxDB connection was a success
         # - and some data was found by the query
         # otherwise fall back to the old Jenkins job history crawling
         if influx_client.health().status == "pass" and matching_builds:
+            log().info("Return None and schedule a new build")
             return None
 
-    log().debug("Start finding matching build via Jenkins API")
+    log().info("Start finding matching build via Jenkins API")
     # fetch a job's build history first
     await job.expand(jenkins_client)
 
+    log().info("Check for matching existing builds")
     # Look for finished builds
     for build in filter(lambda b: b.completed, job.build_infos.values()):
         if meets_constraints(build, params, time_constraints, path_hashes):
             log().info("found matching finished build: %s (%s)", build.number, build.url)
             return build
+    log().info("No matching builds found via the Jenkins API")
 
+    log().info("Check for matching non finished builds")
     # Look for still unfinished builds
     for build in filter(lambda b: not b.completed, job.build_infos.values()):
         if meets_constraints(build, params, time_constraints, path_hashes):
             log().info("found matching unfinished build: %s (%s)", build.number, build.url)
             return build
+    log().info("No matching non finished builds found via the Jenkins API")
 
+    log().info("Check for matching queue items via Jenkins API")
     if args and not args.ignore_build_queue:
         if matching_item := await find_matching_queue_item(
             jenkins_client=jenkins_client,
@@ -1143,9 +1151,11 @@ async def identify_matching_build(
             path_hashes=path_hashes,
             next_check_sleep=next_check_sleep,
         ):
-            log().debug("Found matching queued item %s", matching_item)
+            log().info("Found matching queued item %s", matching_item)
             return await jenkins_client.build_info(job.path, matching_item)
+    log().info("No matching queue items found via Jenkins API")
 
+    log().info("Return None and schedule a new build")
     return None
 
 

{checkmk_dev_tools-2.1.3 → checkmk_dev_tools-2.2.0}/cmk_dev/version.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: UTF-8 -*-
 
-__version_info__ = ("2", "1", "3")
+__version_info__ = ("2", "2", "0")
 __version__ = '.'.join(__version_info__)

{checkmk_dev_tools-2.1.3 → checkmk_dev_tools-2.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "checkmk-dev-tools"
-version = "2.1.3" # will-be-updated-automatically
+version = "2.2.0" # will-be-updated-automatically
 description = "Checkmk DevOps tools"
 authors = [
     "Frans Fürst <frans.fuerst@checkmk.com>",
@@ -14,7 +14,7 @@ exclude = ["cmk_dev/out"]
 
 [tool.poetry.urls]
 Repository = "https://github.com/Checkmk/checkmk-dev-tools"
-Changelog = "https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.1.3/changelog.md"
+Changelog = "https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.2.0/changelog.md"
 
 [tool.poetry.scripts]
 activity-from-fs = 'cmk_dev.activity_from_fs:main'