checkmk-dev-tools 2.1.0__tar.gz → 2.1.2__tar.gz

{checkmk_dev_tools-2.1.0 → checkmk_dev_tools-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: checkmk-dev-tools
-Version: 2.1.0
+Version: 2.1.2
 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.0/changelog.md
+Project-URL: Changelog, https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.1.2/changelog.md
 Project-URL: Repository, https://github.com/Checkmk/checkmk-dev-tools
 Description-Content-Type: text/markdown
 

{checkmk_dev_tools-2.1.0 → checkmk_dev_tools-2.1.2}/cmk_dev/ci_artifacts.py

@@ -575,10 +575,15 @@ def meets_constraints(
 
 
 async def build_id_from_queue_item(
-    client: AugmentedJenkinsClient, queue_id: QueueId, next_check_sleep: int = 30
+    client: AugmentedJenkinsClient,
+    queue_id: QueueId,
+    next_check_sleep: int = 30,
+    queue_item: QueueItem | None = None,
 ) -> BuildId:
     """Waits for queue item with given @queue_id to be scheduled and returns Build instance"""
-    queue_item = await client.queue_item(queue_id)
+    if queue_item is None:
+        queue_item = await client.queue_item(queue_id)
+
     log().info(
         "waiting for queue item %s to be scheduled (%s%s)",
         queue_id,
@@ -680,6 +685,7 @@ async def find_matching_queue_item(
             client=jenkins_client,
             queue_id=queue_item.id,
             next_check_sleep=next_check_sleep,
+            queue_item=queue_item,
         )
 
     log().debug("Found no matching queued item")
@@ -1095,7 +1101,7 @@ async def identify_matching_build(
                 log().info("found matching (may finished) build: %s (%s)", build.number, build.url)
                 return build
 
-        if not args.ignore_build_queue:
+        if hasattr(args, "ignore_build_queue") and not args.ignore_build_queue:
             if matching_item := await find_matching_queue_item(
                 jenkins_client=jenkins_client,
                 job=job,

{checkmk_dev_tools-2.1.0 → checkmk_dev_tools-2.1.2}/cmk_dev/version.py

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

{checkmk_dev_tools-2.1.0 → checkmk_dev_tools-2.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "checkmk-dev-tools"
-version = "2.1.0" # will-be-updated-automatically
+version = "2.1.2" # 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.0/changelog.md"
+Changelog = "https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.1.2/changelog.md"
 
 [tool.poetry.scripts]
 activity-from-fs = 'cmk_dev.activity_from_fs:main'