Fix: avoid infinitely lived test results because they obstruct database query optimization (#948)

Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>

Author: mbuechse

Standards/scs-0003-v1-sovereign-cloud-standards-yaml.md

@@ -253,12 +253,15 @@ TBD
 
 ### Test-case descriptor
 
-| Key               | Type            | Description                                                                                                       | Example           |
-| ----------------- | --------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------- |
-| `id`              | String          | Identifier for this test case (immutable and unique within this module)                                           | `image-md-check`  |
-| `lifetime`        | String          | One of: `day`, `week` (_default_), `month`, `quarter`, `infinite`; the test result is valid until the end of the next period  | `day` |
-| `tags`            | List of strings | A tag is a keyword that will be used to select this test case using a selector expression                         | `[mandatory]`     |
-| `description`     | String          | Short description of the test case                                                                                |                   |
+| Key               | Type            | Description                                                                                       | Example           |
+| ----------------- | --------------- | ------------------------------------------------------------------------------------------------- | ----------------- |
+| `id`              | String          | Identifier for this test case (immutable and unique within this module)                           | `image-md-check`  |
+| `lifetime`        | String          | One of: `day`, `week` (_default_), `month`, `quarter`, `year`                                     | `day`             |
+| `tags`            | List of strings | A tag is a keyword that will be used to select this test case using a selector expression         | `[mandatory]`     |
+| `description`     | String          | Short description of the test case                                                                |                   |
+
+A test result is valid until the end of the next period, except when lifetime is `year`: then the result is
+valid until the end of the following month plus one year.
 
 A tag MUST NOT contain any of these characters: space, comma, exclamation mark, forward slash.
 

Tests/scs-compatible-kaas.yaml

@@ -20,7 +20,7 @@ modules:
     testcases:
       - id: cncf-k8s-conformance
         tags: [mandatory]
-        lifetime: infinite
+        lifetime: year
         description: >
           Must fulfill all requirements of [CNCF Kubernetes conformance](https://github.com/cncf/k8s-conformance/tree/master)
   - id: scs-0210-v2

Tests/scs_cert_lib.py

@@ -141,9 +141,13 @@ def add_period(dt: datetime, period: str) -> datetime:
         if dt.month >= 4:
             return datetime(dt.year, 10, 1)
         return datetime(dt.year, 7, 1)
-    if period == 'infinite':
-        # admittedly HACKY, but this case is better handled by caller
-        return datetime(dt.year + 1000, 1, 1)
+    if period == 'year':
+        if dt.month == 11:
+            return datetime(dt.year + 2, 1, 1)
+        if dt.month == 12:
+            return datetime(dt.year + 2, 2, 1)
+        return datetime(dt.year + 1, dt.month + 2, 1)
+    raise RuntimeError(f'unknown period: {period}')
 
 
 def parse_selector(selector_str: str) -> list[list[str]]:

compliance-monitor/monitor.py

@@ -514,7 +514,7 @@ def convert_result_rows_to_dict2(
             continue
         # drop value if too old
         lifetime = testcase.get('lifetime')  # leave None if not present; to be handled by add_period
-        if lifetime != 'infinite' and now >= add_period(checked_at, lifetime):
+        if now >= add_period(checked_at, lifetime):
             continue
         tc_result = dict(result=result, checked_at=checked_at)
         if include_report: