Relax test frequency expectations across the board (#947)

resolves #936

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

Author: mbuechse

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

@@ -256,7 +256,7 @@ TBD
 | 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` (_default_), `week`, `month`, `quarter`; the test result is valid until the end of the next period  | `week`            |
+| `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                                                                                |                   |
 

Tests/scs-compatible-kaas.yaml

@@ -20,6 +20,7 @@ modules:
     testcases:
       - id: cncf-k8s-conformance
         tags: [mandatory]
+        lifetime: infinite
         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

@@ -120,10 +120,11 @@ def add_period(dt: datetime, period: str) -> datetime:
     https://docs.scs.community/standards/scs-0004-v1-achieving-certification#regulations
     """
     # compute the moment of expiry (so we are valid before that point, but not on that point)
-    if period is None or period == 'day':  # day is default, so use it if period is None
+    if period == 'day':
         dt += timedelta(days=2)
         return datetime(dt.year, dt.month, dt.day)  # omit time so as to arrive at midnight
-    if period == 'week':
+    # week is default, so use it if period is None
+    if period is None or period == 'week':
         dt += timedelta(days=14 - dt.weekday())
         return datetime(dt.year, dt.month, dt.day)  # omit time so as to arrive at midnight
     if period == 'month':
@@ -140,6 +141,9 @@ 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)
 
 
 def parse_selector(selector_str: str) -> list[list[str]]:

compliance-monitor/monitor.py

@@ -513,8 +513,8 @@ def convert_result_rows_to_dict2(
                 missing.add((scope_uuid, version, testcase_id))
             continue
         # drop value if too old
-        expires_at = add_period(checked_at, testcase.get('lifetime'))
-        if now >= expires_at:
+        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):
             continue
         tc_result = dict(result=result, checked_at=checked_at)
         if include_report: