checkmk-dev-tools 2.1.4__tar.gz → 2.2.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/PKG-INFO +2 -2
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/ci_artifacts.py +15 -3
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/version.py +1 -1
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/pyproject.toml +2 -2
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/README.md +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/__init__.py +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/activity_from_fs.py +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/binreplace.py +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/check_rpath.py +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/cli.py +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/cpumon.py +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/decent_output.py +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/jenkins_utils/__init__.py +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/job_resource_usage.py +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/last_access.py +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/lockable_resources.py +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/procmon.py +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/pycinfo.py +0 -0
- {checkmk_dev_tools-2.1.4 → checkmk_dev_tools-2.2.0}/cmk_dev/utils.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: checkmk-dev-tools
|
|
3
|
-
Version: 2.
|
|
3
|
+
Version: 2.2.0
|
|
4
4
|
Summary: Checkmk DevOps tools
|
|
5
5
|
Author: Frans Fürst
|
|
6
6
|
Author-email: frans.fuerst@checkmk.com
|
|
@@ -14,7 +14,7 @@ Requires-Dist: pydantic (>=2,<3)
|
|
|
14
14
|
Requires-Dist: python-jenkins (>=1.8.3,<1.9.0)
|
|
15
15
|
Requires-Dist: rich
|
|
16
16
|
Requires-Dist: trickkiste (>=0.3.4,<0.4.0)
|
|
17
|
-
Project-URL: Changelog, https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.
|
|
17
|
+
Project-URL: Changelog, https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.2.0/changelog.md
|
|
18
18
|
Project-URL: Repository, https://github.com/Checkmk/checkmk-dev-tools
|
|
19
19
|
Description-Content-Type: text/markdown
|
|
20
20
|
|
|
@@ -1093,12 +1093,15 @@ async def identify_matching_build(
|
|
|
1093
1093
|
f"Got {len(matching_builds)} InfluxDB job history entries of today, generated {len(builds)} builds to check"
|
|
1094
1094
|
)
|
|
1095
1095
|
|
|
1096
|
+
log().info("Check for matching existing builds")
|
|
1096
1097
|
# ugly code duplication incomming, rework this to a dedicated function
|
|
1097
1098
|
for build in list(builds.values()):
|
|
1098
1099
|
if meets_constraints(build, params, time_constraints, path_hashes):
|
|
1099
1100
|
log().info("found matching (may finished) build: %s (%s)", build.number, build.url)
|
|
1100
1101
|
return build
|
|
1102
|
+
log().info("No matching builds found in the InfluxDB")
|
|
1101
1103
|
|
|
1104
|
+
log().info("Check for matching queue items via Jenkins API")
|
|
1102
1105
|
if hasattr(args, "ignore_build_queue") and not args.ignore_build_queue:
|
|
1103
1106
|
if matching_item := await find_matching_queue_item(
|
|
1104
1107
|
jenkins_client=jenkins_client,
|
|
@@ -1107,32 +1110,39 @@ async def identify_matching_build(
|
|
|
1107
1110
|
path_hashes=path_hashes,
|
|
1108
1111
|
next_check_sleep=next_check_sleep,
|
|
1109
1112
|
):
|
|
1110
|
-
log().
|
|
1113
|
+
log().info("Found matching queued item %s", matching_item)
|
|
1111
1114
|
return await jenkins_client.build_info(job.path, matching_item)
|
|
1115
|
+
log().info("No matching queue items found via Jenkins API")
|
|
1112
1116
|
|
|
1113
1117
|
# exit here with no matching result if
|
|
1114
1118
|
# - the InfluxDB connection was a success
|
|
1115
1119
|
# - and some data was found by the query
|
|
1116
1120
|
# otherwise fall back to the old Jenkins job history crawling
|
|
1117
1121
|
if influx_client.health().status == "pass" and matching_builds:
|
|
1122
|
+
log().info("Return None and schedule a new build")
|
|
1118
1123
|
return None
|
|
1119
1124
|
|
|
1120
|
-
log().
|
|
1125
|
+
log().info("Start finding matching build via Jenkins API")
|
|
1121
1126
|
# fetch a job's build history first
|
|
1122
1127
|
await job.expand(jenkins_client)
|
|
1123
1128
|
|
|
1129
|
+
log().info("Check for matching existing builds")
|
|
1124
1130
|
# Look for finished builds
|
|
1125
1131
|
for build in filter(lambda b: b.completed, job.build_infos.values()):
|
|
1126
1132
|
if meets_constraints(build, params, time_constraints, path_hashes):
|
|
1127
1133
|
log().info("found matching finished build: %s (%s)", build.number, build.url)
|
|
1128
1134
|
return build
|
|
1135
|
+
log().info("No matching builds found via the Jenkins API")
|
|
1129
1136
|
|
|
1137
|
+
log().info("Check for matching non finished builds")
|
|
1130
1138
|
# Look for still unfinished builds
|
|
1131
1139
|
for build in filter(lambda b: not b.completed, job.build_infos.values()):
|
|
1132
1140
|
if meets_constraints(build, params, time_constraints, path_hashes):
|
|
1133
1141
|
log().info("found matching unfinished build: %s (%s)", build.number, build.url)
|
|
1134
1142
|
return build
|
|
1143
|
+
log().info("No matching non finished builds found via the Jenkins API")
|
|
1135
1144
|
|
|
1145
|
+
log().info("Check for matching queue items via Jenkins API")
|
|
1136
1146
|
if args and not args.ignore_build_queue:
|
|
1137
1147
|
if matching_item := await find_matching_queue_item(
|
|
1138
1148
|
jenkins_client=jenkins_client,
|
|
@@ -1141,9 +1151,11 @@ async def identify_matching_build(
|
|
|
1141
1151
|
path_hashes=path_hashes,
|
|
1142
1152
|
next_check_sleep=next_check_sleep,
|
|
1143
1153
|
):
|
|
1144
|
-
log().
|
|
1154
|
+
log().info("Found matching queued item %s", matching_item)
|
|
1145
1155
|
return await jenkins_client.build_info(job.path, matching_item)
|
|
1156
|
+
log().info("No matching queue items found via Jenkins API")
|
|
1146
1157
|
|
|
1158
|
+
log().info("Return None and schedule a new build")
|
|
1147
1159
|
return None
|
|
1148
1160
|
|
|
1149
1161
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[tool.poetry]
|
|
2
2
|
name = "checkmk-dev-tools"
|
|
3
|
-
version = "2.
|
|
3
|
+
version = "2.2.0" # will-be-updated-automatically
|
|
4
4
|
description = "Checkmk DevOps tools"
|
|
5
5
|
authors = [
|
|
6
6
|
"Frans Fürst <frans.fuerst@checkmk.com>",
|
|
@@ -14,7 +14,7 @@ exclude = ["cmk_dev/out"]
|
|
|
14
14
|
|
|
15
15
|
[tool.poetry.urls]
|
|
16
16
|
Repository = "https://github.com/Checkmk/checkmk-dev-tools"
|
|
17
|
-
Changelog = "https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.
|
|
17
|
+
Changelog = "https://github.com/Checkmk/checkmk-dev-tools/blob/release/2.2.0/changelog.md"
|
|
18
18
|
|
|
19
19
|
[tool.poetry.scripts]
|
|
20
20
|
activity-from-fs = 'cmk_dev.activity_from_fs:main'
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|