From 5a58c2d257f5c2bc83eb340b60d07657d5be4379 Mon Sep 17 00:00:00 2001 From: Vivek Jain Date: Wed, 24 Apr 2024 21:08:17 -0700 Subject: [PATCH 1/2] vdk-control-cli: Enhanching job deletion to delete scheduled crons --- .../com/vmware/taurus/service/deploy/DeploymentService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/DeploymentService.java b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/DeploymentService.java index 59d7f908bb..4dc3ef82d4 100644 --- a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/DeploymentService.java +++ b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/DeploymentService.java @@ -262,8 +262,11 @@ public void deleteDeployment(String dataJobName) { } private boolean deploymentExistsOrInProgress(String dataJobName) { + /* return jobImageBuilder.isBuildingJobInProgress(dataJobName) || readDeployment(dataJobName).isPresent(); + */ + return true; } private void setPythonVersionIfNull(JobDeployment oldDeployment, JobDeployment newDeployment) { From e62b1f585627bf49c17d2e15b5bf61731e9d6246 Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Thu, 25 Apr 2024 04:08:49 +0000 Subject: [PATCH 2/2] Google Java Format --- .../com/vmware/taurus/service/deploy/DeploymentService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/DeploymentService.java b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/DeploymentService.java index 4dc3ef82d4..0b226b0c0e 100644 --- a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/DeploymentService.java +++ b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/DeploymentService.java @@ -262,11 +262,11 @@ public void deleteDeployment(String dataJobName) { } private boolean deploymentExistsOrInProgress(String dataJobName) { - /* + /* return jobImageBuilder.isBuildingJobInProgress(dataJobName) || readDeployment(dataJobName).isPresent(); */ - return true; + return true; } private void setPythonVersionIfNull(JobDeployment oldDeployment, JobDeployment newDeployment) {