krkn-lib 5.1.5__tar.gz → 5.1.7__tar.gz

{krkn_lib-5.1.5 → krkn_lib-5.1.7}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: krkn-lib
-Version: 5.1.5
+Version: 5.1.7
 Summary: Foundation library for Kraken
 License: Apache-2.0
+License-File: LICENSE
 Author: Red Hat Chaos Team
 Requires-Python: >=3.9,<4.0
 Classifier: License :: OSI Approved :: Apache Software License
@@ -12,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: PyYAML (==6.0.1)
 Requires-Dist: base64io (>=1.0.3,<2.0.0)
 Requires-Dist: coverage (>=7.6.12,<8.0.0)

{krkn_lib-5.1.5 → krkn_lib-5.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "krkn-lib"
-version = "5.1.5"
+version = "5.1.7"
 description = "Foundation library for Kraken"
 authors = ["Red Hat Chaos Team"]
 license = "Apache-2.0"

{krkn_lib-5.1.5 → krkn_lib-5.1.7}/src/krkn_lib/k8s/pod_monitor/pod_monitor.py

@@ -1,10 +1,9 @@
-import os
 import re
 from concurrent.futures import Future
 from concurrent.futures.thread import ThreadPoolExecutor
 from functools import partial
 
-from kubernetes import config, watch
+from kubernetes import watch
 from kubernetes.client import V1Pod, CoreV1Api
 
 from krkn_lib.models.pod_monitor.models import (
@@ -14,9 +13,6 @@ from krkn_lib.models.pod_monitor.models import (
     PodStatus,
 )
 
-config.load_kube_config(os.path.join(os.environ["HOME"], ".kube/config"))
-
-
 def _select_pods(
     select_partial: partial,
     namespace_pattern: str = None,

{krkn_lib-5.1.5 → krkn_lib-5.1.7}/src/krkn_lib/models/pod_monitor/models.py

@@ -8,6 +8,7 @@ from krkn_lib.models.k8s import PodsStatus, AffectedPod
 
 
 class PodStatus(Enum):
+    UNDEFINED = 0
     READY = 1
     NOT_READY = 2
     DELETION_SCHEDULED = 3
@@ -20,6 +21,7 @@ class PodEvent:
     status: PodStatus
 
     def __init__(self, timestamp: float = None):
+        self.status = PodStatus.UNDEFINED
         if not timestamp:
             self._timestamp = time.time()
         else:
@@ -142,12 +144,18 @@ class PodsSnapshot:
                             )
                         )
                     else:
+                        # pod stayed ready but was restarted 
+                        # or has a failed container
                         pods_status.recovered.append(
                             AffectedPod(
                                 pod_name=pod.name,
                                 namespace=pod.namespace,
                                 pod_readiness_time=ready_status.timestamp
                                 - status_change.timestamp,
+                                pod_rescheduling_time=0,
+                                total_recovery_time=
+                                        ready_status.timestamp
+                                            - status_change.timestamp
                             )
                         )
                     break

{krkn_lib-5.1.5 → krkn_lib-5.1.7}/src/krkn_lib/tests/test_krkn_kubernetes_pods_monitor.py

@@ -441,8 +441,9 @@ class TestKrknKubernetesPodsMonitor(BaseTest):
         pods_status = snapshot.get_pods_status()
         self.background_delete_ns(namespace)
         self.assertEqual(len(pods_status.recovered), 1)
-        self.assertEqual(pods_status.recovered[0].pod_rescheduling_time, None)
+        self.assertEqual(pods_status.recovered[0].pod_rescheduling_time, 0)
         self.assertGreater(pods_status.recovered[0].pod_readiness_time, 0)
+        self.assertEqual(pods_status.recovered[0].total_recovery_time, pods_status.recovered[0].pod_readiness_time)
 
     def test_monitor_stopping_earlier(self):
 

{krkn_lib-5.1.5 → krkn_lib-5.1.7}/src/krkn_lib/tests/test_utils.py

@@ -426,7 +426,25 @@ class UtilFunctionTests(BaseTest):
         os.environ["JOB_NAME"] = "1953335493844275200"
         ci_job_url = utils.get_ci_job_url()
         print("ci job url" + str(ci_job_url))
-        self.assertIn("prow.ci.openshift.org", ci_job_url)
+        self.assertIn(
+            "prow.ci.openshift.org/view/gs/origin-ci-test", ci_job_url
+        )
+        os.environ["PULL_NUMBER"] = "68493"
+        os.environ["PROW_JOB_ID"] = os.environ["JOB_NAME"] = (
+            "1965813126276321280"
+        )
+        os.environ["JOB_TYPE"] = "presubmit"
+
+        os.environ["BUILD_ID"] = (
+            "rehearse-68493-periodic-ci-redhat-chaos-prow-scripts-main-4.20-nightly-krkn-hub-node-tests-aws-ipsec"  # NOQA
+        )
+
+        ci_job_url = utils.get_ci_job_url()
+        print("ci job url" + str(ci_job_url))
+        self.assertIn(
+            "prow.ci.openshift.org/view/gs/test-platform-results", ci_job_url
+        )
+
         os.environ["PROW_JOB_ID"] = ""
         os.environ["BUILD_URL"] = (
             "https://jenkins-csb-openshift-qe-mastern.dno.corp.redhat.com/job/scale-ci/job/e2e-benchmarking-multibranch-pipeline/job/kraken/"  # NOQA

{krkn_lib-5.1.5 → krkn_lib-5.1.7}/src/krkn_lib/utils/functions.py

@@ -472,10 +472,26 @@ def get_ci_job_url():
         prow_base_url = (
             "https://prow.ci.openshift.org/view/gs/origin-ci-test/logs"
         )
+        prow_pr_base_url=(
+            "https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_release" # NOQA
+        )
         task_id = os.getenv("BUILD_ID")
         job_id = os.getenv("JOB_NAME")
-
-        build_url = f"{prow_base_url}/{job_id}/{task_id}"
+        pull_number = os.getenv("PULL_NUMBER")
+        job_type=os.getenv("JOB_TYPE")
+        if job_type == "presubmit" and "pull" in task_id:
+            # Indicates a ci test triggered in PR against source code
+            job_type = "pull"
+        if job_type == "presubmit" and "rehearse" in task_id:
+            # Indicates a rehearsel in PR against openshift/release repo
+            job_type = "pull"
+        # Handle cases where a periodic job iw triggered via pull request
+        if job_type == "periodic" and pull_number:
+          job_type = "pull"
+        if job_type == "pull" :
+            build_url=f"{prow_pr_base_url}/{pull_number}/{task_id}/{job_id}"
+        else:
+            build_url=f"{prow_base_url}/{job_id}/{task_id}"
 
     elif os.getenv("BUILD_URL", ""):
         # Jenkins build url