From dfcf79b72b284e0ace5c1993cd1278fb0676c661 Mon Sep 17 00:00:00 2001 From: Yana Zhivkova Date: Tue, 8 Mar 2022 20:16:15 +0200 Subject: [PATCH] vdk-heartbeat: Fix initial job executions with specific vdk version When vdk-heartbeat is run with a configured vdk version (VDK_HEARTBEAT_DEPLOY_JOB_VDK_VERSION) sometimes the cron job manages to start an execution before actually setting the deployment vdk_version. This happens because vdk_version is set with a separate update deployment call (function enable_deployment_and_update_vdk_version) after the deployment was ready. Move setting vdk_version in the create deployment command. Testing Done: locally tested vdk-heartbeat against demo control service with set VDK_HEARTBEAT_DEPLOY_JOB_VDK_VERSION and observed that all execution pods used the specified vdk version image. Signed-off-by: Yana Zhivkova --- .../vdk-heartbeat/src/vdk/internal/heartbeat/hearbeat.py | 2 +- .../src/vdk/internal/heartbeat/job_controller.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/projects/vdk-heartbeat/src/vdk/internal/heartbeat/hearbeat.py b/projects/vdk-heartbeat/src/vdk/internal/heartbeat/hearbeat.py index 1ae0a15f5b..70f2cc7061 100644 --- a/projects/vdk-heartbeat/src/vdk/internal/heartbeat/hearbeat.py +++ b/projects/vdk-heartbeat/src/vdk/internal/heartbeat/hearbeat.py @@ -42,7 +42,7 @@ def run(self): run_test.setup() - job_controller.enable_deployment_and_update_vdk_version() + job_controller.enable_deployment() job_controller.show_job_details() run_test.execute_test() diff --git a/projects/vdk-heartbeat/src/vdk/internal/heartbeat/job_controller.py b/projects/vdk-heartbeat/src/vdk/internal/heartbeat/job_controller.py index 6b1f8578fe..a516809a56 100644 --- a/projects/vdk-heartbeat/src/vdk/internal/heartbeat/job_controller.py +++ b/projects/vdk-heartbeat/src/vdk/internal/heartbeat/job_controller.py @@ -57,7 +57,6 @@ def __get_rest_api_url_arg(self): def __get_vdk_version_arg(self): if self.config.deploy_job_vdk_version: return [ - "--update", "--vdk-version", f"{self.config.deploy_job_vdk_version}", ] @@ -246,7 +245,7 @@ def set_job_property(self, key: str, value: str): ) @LogDecorator(log) - def enable_deployment_and_update_vdk_version(self): + def enable_deployment(self): self._execute( [ "deploy", @@ -256,7 +255,6 @@ def enable_deployment_and_update_vdk_version(self): "-t", self.config.job_team, ] - + self.__get_vdk_version_arg() + self.__get_rest_api_url_arg() ) @@ -293,6 +291,7 @@ def deploy_job(self): "-r", "Updating heartbeat data job", ] + + self.__get_vdk_version_arg() + self.__get_rest_api_url_arg() )