From d44fcb95db7f2e093c3243d30aefe50ee9811e37 Mon Sep 17 00:00:00 2001 From: Andrei Matveyeu Date: Tue, 19 Nov 2024 12:14:00 +0100 Subject: [PATCH] Read TERCC from Kubernetes instead of environment --- .../src/etos_suite_runner/lib/esr_parameters.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/projects/etos_suite_runner/src/etos_suite_runner/lib/esr_parameters.py b/projects/etos_suite_runner/src/etos_suite_runner/lib/esr_parameters.py index 756f5b5..e5c8377 100644 --- a/projects/etos_suite_runner/src/etos_suite_runner/lib/esr_parameters.py +++ b/projects/etos_suite_runner/src/etos_suite_runner/lib/esr_parameters.py @@ -24,6 +24,7 @@ EiffelTestExecutionRecipeCollectionCreatedEvent, ) from etos_lib import ETOS +from etos_lib.kubernetes import Kubernetes, TestRun from packageurl import PackageURL from .graphql import request_artifact_created @@ -76,7 +77,14 @@ def tercc(self) -> EiffelTestExecutionRecipeCollectionCreatedEvent: """ if self.etos.config.get("tercc") is None: tercc = EiffelTestExecutionRecipeCollectionCreatedEvent() - tercc.rebuild(json.loads(os.getenv("TERCC"))) + tercc_json = None + if os.getenv("TERCC") is not None: + # first option for backwards compatibility + tercc_json = json.loads(os.getenv("TERCC")) + else: + # requires testrun custom resource defined in Kubernetes + tercc_json = TestRun(Kubernetes()).get(os.getenv("TESTRUN")) + tercc.rebuild(tercc_json) self.etos.config.set("tercc", tercc) return self.etos.config.get("tercc")