Skip to content

Commit 59d8218

Browse files
author
dakodakov
authored
control-service: fix disabled jobs not building (#3376)
Fix the deployment logic, so that a job would be built, even if it is disabled. Remove redundant test. --------- Signed-off-by: Dako Dakov <ddakov@vmware.com> Co-authored-by: github-actions <>
1 parent de2c45a commit 59d8218

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/DeploymentServiceV2.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,9 @@ public void updateDeployment(
160160
dockerRegistryService.dataJobImage(
161161
desiredJobDeployment.getDataJobName(), desiredJobDeployment.getGitCommitSha());
162162

163-
// If the job suspension operation is performed, we don't want to build the image.
164-
if (Boolean.FALSE.equals(desiredJobDeployment.getEnabled())
163+
// If a previously enabled job is being disabled, we don't want to build the image.
164+
if ((Boolean.FALSE.equals(desiredJobDeployment.getEnabled())
165+
&& Boolean.TRUE.equals(actualJobDeployment.getEnabled()))
165166
|| jobImageBuilder.buildImage(
166167
imageName, dataJob, desiredJobDeployment, actualJobDeployment, sendNotification)) {
167168
ActualDataJobDeployment actualJobDeploymentResult =

projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/deploy/DeploymentServiceV2TestIT.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ public void updateDeployment_withDesiredDeploymentStatusNone_shouldStartDeployme
7878
updateDeployment(false, true, false, 1);
7979
}
8080

81-
@Test
82-
public void
83-
updateDeployment_withDesiredDeploymentEnabledFalseAndActualDeploymentEnabledFalseAndBuildImageSucceededFalse_shouldUpdateDeployment()
84-
throws IOException, InterruptedException, ApiException {
85-
updateDeployment(false, false, false, 1);
86-
}
87-
8881
@Test
8982
public void
9083
updateDeployment_withDesiredDeploymentEnabledTrueAndActualDeploymentEnabledFalseAndBuildImageSucceededTrue_shouldUpdateDeployment()

0 commit comments

Comments
 (0)