From 038ee1e7c6b66c23aaebd1e092c6ee9058277ff8 Mon Sep 17 00:00:00 2001 From: Miroslav Ivanov Date: Thu, 2 Feb 2023 17:54:52 +0200 Subject: [PATCH 1/6] Fixed data job status in case of OOM --- .../datajobs/it/DataJobDeploymentCrudIT.java | 4 +- .../it/DataJobEphemeralStorageIT.java | 6 -- .../taurus/datajobs/it/DataJobOOMIT.java | 52 ++++++++++++++++++ .../it/common/DataJobDeploymentExtension.java | 4 +- .../{ => data_jobs}/job_ephemeral_storage.zip | Bin .../resources/data_jobs/oom_job.zip | Bin 0 -> 1861 bytes .../resources/{ => data_jobs}/simple_job.zip | Bin .../{ => data_jobs}/simple_job_cancel.zip | Bin .../taurus/service/KubernetesService.java | 6 ++ 9 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobOOMIT.java rename projects/control-service/projects/pipelines_control_service/src/integration-test/resources/{ => data_jobs}/job_ephemeral_storage.zip (100%) create mode 100644 projects/control-service/projects/pipelines_control_service/src/integration-test/resources/data_jobs/oom_job.zip rename projects/control-service/projects/pipelines_control_service/src/integration-test/resources/{ => data_jobs}/simple_job.zip (100%) rename projects/control-service/projects/pipelines_control_service/src/integration-test/resources/{ => data_jobs}/simple_job_cancel.zip (100%) diff --git a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudIT.java b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudIT.java index 980739ae8b..4e9969f5b4 100644 --- a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudIT.java +++ b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudIT.java @@ -92,7 +92,7 @@ public void testDataJobDeploymentCrud() throws Exception { // Take the job zip as byte array byte[] jobZipBinary = - IOUtils.toByteArray(getClass().getClassLoader().getResourceAsStream("simple_job.zip")); + IOUtils.toByteArray(getClass().getClassLoader().getResourceAsStream("data_jobs/simple_job.zip")); // Execute job upload with no user mockMvc @@ -376,7 +376,7 @@ public void cleanUp() throws Exception { @Test public void testDataJobDeleteSource() throws Exception { byte[] jobZipBinary = - IOUtils.toByteArray(getClass().getClassLoader().getResourceAsStream("simple_job.zip")); + IOUtils.toByteArray(getClass().getClassLoader().getResourceAsStream("data_jobs/simple_job.zip")); mockMvc .perform( diff --git a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobEphemeralStorageIT.java b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobEphemeralStorageIT.java index debda7106f..48bfb58152 100644 --- a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobEphemeralStorageIT.java +++ b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobEphemeralStorageIT.java @@ -5,8 +5,6 @@ package com.vmware.taurus.datajobs.it; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.databind.ObjectMapper; import com.vmware.taurus.ControlplaneApplication; import com.vmware.taurus.controlplane.model.data.DataJobExecution; import com.vmware.taurus.datajobs.it.common.BaseIT; @@ -29,10 +27,6 @@ classes = ControlplaneApplication.class) public class DataJobEphemeralStorageIT extends BaseIT { - private final ObjectMapper objectMapper = - new ObjectMapper() - .registerModule(new JavaTimeModule()); // Used for converting to OffsetDateTime; - @RegisterExtension static DataJobDeploymentExtension dataJobDeploymentExtension = new DataJobDeploymentExtension("job_ephemeral_storage.zip"); diff --git a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobOOMIT.java b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobOOMIT.java new file mode 100644 index 0000000000..f354f1634e --- /dev/null +++ b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobOOMIT.java @@ -0,0 +1,52 @@ +/* + * Copyright 2021 VMware, Inc. + * SPDX-License-Identifier: Apache-2.0 + */ + +package com.vmware.taurus.datajobs.it; + +import com.vmware.taurus.ControlplaneApplication; +import com.vmware.taurus.controlplane.model.data.DataJobExecution; +import com.vmware.taurus.datajobs.it.common.BaseIT; +import com.vmware.taurus.datajobs.it.common.DataJobDeploymentExtension; +import com.vmware.taurus.datajobs.it.common.JobExecutionUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.awaitility.Awaitility.await; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + +@Slf4j +@SpringBootTest( + webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + classes = ControlplaneApplication.class) +public class DataJobOOMIT extends BaseIT { + + @RegisterExtension + static DataJobDeploymentExtension dataJobDeploymentExtension = + new DataJobDeploymentExtension("oom_job.zip"); + + @Test + public void testDataJob_causesOOM_shouldCompleteWithUserError( + String jobName, String teamName, String username, String deploymentId) throws Exception { + // manually start job execution + ImmutablePair executeDataJobResult = + JobExecutionUtil.executeDataJob(jobName, teamName, username, deploymentId, mockMvc); + String opId = executeDataJobResult.getLeft(); + String executionId = executeDataJobResult.getRight(); + + // Check the data job execution status + JobExecutionUtil.checkDataJobExecutionStatus( + executionId, + DataJobExecution.StatusEnum.USER_ERROR, + opId, + jobName, + teamName, + username, + mockMvc); + } +} diff --git a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/common/DataJobDeploymentExtension.java b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/common/DataJobDeploymentExtension.java index a172991580..9ec717c47f 100644 --- a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/common/DataJobDeploymentExtension.java +++ b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/common/DataJobDeploymentExtension.java @@ -70,6 +70,8 @@ public class DataJobDeploymentExtension private static final String DEPLOYMENT_ID = "NOT_USED"; private static final String TEAM_NAME = "test-team"; + private static final String JOB_SOURCE_PATH = "data_jobs/"; + protected final ObjectMapper MAPPER = new ObjectMapper(); private String jobName = @@ -124,7 +126,7 @@ public void beforeEach(ExtensionContext context) throws Exception { if (!initialized) { byte[] jobZipBinary = - IOUtils.toByteArray(getClass().getClassLoader().getResourceAsStream(jobSource)); + IOUtils.toByteArray(getClass().getClassLoader().getResourceAsStream(JOB_SOURCE_PATH + jobSource)); // Upload the data job MvcResult uploadResult = diff --git a/projects/control-service/projects/pipelines_control_service/src/integration-test/resources/job_ephemeral_storage.zip b/projects/control-service/projects/pipelines_control_service/src/integration-test/resources/data_jobs/job_ephemeral_storage.zip similarity index 100% rename from projects/control-service/projects/pipelines_control_service/src/integration-test/resources/job_ephemeral_storage.zip rename to projects/control-service/projects/pipelines_control_service/src/integration-test/resources/data_jobs/job_ephemeral_storage.zip diff --git a/projects/control-service/projects/pipelines_control_service/src/integration-test/resources/data_jobs/oom_job.zip b/projects/control-service/projects/pipelines_control_service/src/integration-test/resources/data_jobs/oom_job.zip new file mode 100644 index 0000000000000000000000000000000000000000..c47d96bc081a719ac169a36fae36240023cde50a GIT binary patch literal 1861 zcmWIWW@Zs#0D-1lyD%^VN^meJFy!aw#%JXx>4%2!GO)L-y`H=Yh}QyfX$3a}Bg+eB z1_m$@05*k#frCM~cXtrXlutm01d=I5sfDGPMX9-|c_qbqB^4!LQ`6S3Pnf*UAu$Nk z)Y@}~d4~-ITrS>QF5ysm;@)zOgzt>5eT#T!s2+}Gy!2Lgx7X8O%>4C-o=K9$@|AOu|z3+3?I-Gi__sFYzZ>5r_%drK2 zoVqlX`;wCBtmQk6@{WD{y4N#t&cAGV|C4?%_kCLG#Its{iLa>V>DNWic80vvnZSDM z-rHr48pdbOiO2(-9+b z^wrtq^NjiNr?e08cJr8*8mma=AFY=;mesYZ{_l+D$3-5$&gb0Ila0A7bdee4^82?J zeT@dX4dgzA%WGzd2LlDb;5Z`#gAkI-lk@Y^GSl@k^D@CsUwcY9aRM;Lu*BNb2^;;6 z81S@xw`qMYJ;A|Xu9o6KCjA2ep%Y*4xb7eoUgq@ht>=3Q$0pUFH~;_tx$RzYYVwOF zRWCM~rD7V!%{engQ>^OcHY(Vhe(|fgvY@r_<(hSCR5Xtscy&imPR0LY$k#(bei0T9 zf){2LpHb(qeje&pTwBeaZc@CW(>Bw%q=0>ULBnfli#I!_M<#S@9z5YNiThIDVVMP; z+adYTsm*awz4^ouy|EntO6TR_|G<^*d|L zyinKOo06Pn-+%P?_ojuPL{ENNou7OAUHhN@>so@d|N6>Q_KizHH*8XCkGRF-7q=fxM7q!#EERKl|vD64@mS~i9ij(L%4qb z*A-}|8q|qxz`-%wwY7>+;3g`tZS8R zx2CGz4APXkH&ZGk>v1e|^yewBrd@KMo}P011cP!(-NR3x^V~Hr9{w0Ub&E^fDdk_8 z(<1LCOglRzh|T=L;<@j*b@@coxLG%;P4=v}@7|VBBxbd>k$s{q1M7z$GAB>-MHbv! z(BAub!NR+RswEmWTQBWtmTA?E$$aUXA=_ekb&cbn1k*!3x*6FF@f$mO)I#@uKl@U3 z%e~x_2`{`Jiv7)dZ_shzX@7*lnTHcj$?UkqGj)ck#s<#V;_ihnF1}EDd7#+E-}&w8 zrzcnC>s)8NJW+(r*?-o$)J;s^&gy>^?&~p$NZ^p&^8X9(^@Jx3xf3`_d3%i``0uR! z7P0e3>NYoN+GZ0zIv6FM=odB zojH+zwSLbp@6D&PxO660Oy7_);|~AJ{UIUBF~2(w&!|mK-4eYeZB|VAAD>z#P_#c* zo3myDFv>xZ8{o~zB*KilIECgdhQE#=7V(8E#8g=Eid^h~idPue(&&a{DyfAn%t52hg`Lw-a5UAsY`WXOMFXsGNa;Esab}2;+$_b&$;m getJobExecutionStatus(V1Job job, JobStatusCondition jobSt jobExecutionStatusBuilder.succeeded( Optional.ofNullable(jobStatusCondition).map(JobStatusCondition::isSuccess).orElse(null)); + // omits events that come after the Data Job completion + if (jobExecutionStatusBuilder.succeeded != null + && StringUtils.isBlank(jobExecutionStatusBuilder.containerTerminationReason)) { + return Optional.empty(); + } + return Optional.of(jobExecutionStatusBuilder.build()); } From 347cc128cdc46c44944cf46a2c3bb7fe5d742a84 Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Thu, 2 Feb 2023 15:56:17 +0000 Subject: [PATCH 2/6] Google Java Format --- .../datajobs/it/DataJobDeploymentCrudIT.java | 6 ++- .../taurus/datajobs/it/DataJobOOMIT.java | 49 +++++++++---------- .../it/common/DataJobDeploymentExtension.java | 3 +- .../taurus/service/KubernetesService.java | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudIT.java b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudIT.java index 4e9969f5b4..cba2437450 100644 --- a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudIT.java +++ b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudIT.java @@ -92,7 +92,8 @@ public void testDataJobDeploymentCrud() throws Exception { // Take the job zip as byte array byte[] jobZipBinary = - IOUtils.toByteArray(getClass().getClassLoader().getResourceAsStream("data_jobs/simple_job.zip")); + IOUtils.toByteArray( + getClass().getClassLoader().getResourceAsStream("data_jobs/simple_job.zip")); // Execute job upload with no user mockMvc @@ -376,7 +377,8 @@ public void cleanUp() throws Exception { @Test public void testDataJobDeleteSource() throws Exception { byte[] jobZipBinary = - IOUtils.toByteArray(getClass().getClassLoader().getResourceAsStream("data_jobs/simple_job.zip")); + IOUtils.toByteArray( + getClass().getClassLoader().getResourceAsStream("data_jobs/simple_job.zip")); mockMvc .perform( diff --git a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobOOMIT.java b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobOOMIT.java index f354f1634e..49f4e38fb6 100644 --- a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobOOMIT.java +++ b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobOOMIT.java @@ -16,37 +16,34 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.boot.test.context.SpringBootTest; -import static org.awaitility.Awaitility.await; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @Slf4j @SpringBootTest( - webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, - classes = ControlplaneApplication.class) + webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + classes = ControlplaneApplication.class) public class DataJobOOMIT extends BaseIT { - @RegisterExtension - static DataJobDeploymentExtension dataJobDeploymentExtension = - new DataJobDeploymentExtension("oom_job.zip"); + @RegisterExtension + static DataJobDeploymentExtension dataJobDeploymentExtension = + new DataJobDeploymentExtension("oom_job.zip"); - @Test - public void testDataJob_causesOOM_shouldCompleteWithUserError( - String jobName, String teamName, String username, String deploymentId) throws Exception { - // manually start job execution - ImmutablePair executeDataJobResult = - JobExecutionUtil.executeDataJob(jobName, teamName, username, deploymentId, mockMvc); - String opId = executeDataJobResult.getLeft(); - String executionId = executeDataJobResult.getRight(); + @Test + public void testDataJob_causesOOM_shouldCompleteWithUserError( + String jobName, String teamName, String username, String deploymentId) throws Exception { + // manually start job execution + ImmutablePair executeDataJobResult = + JobExecutionUtil.executeDataJob(jobName, teamName, username, deploymentId, mockMvc); + String opId = executeDataJobResult.getLeft(); + String executionId = executeDataJobResult.getRight(); - // Check the data job execution status - JobExecutionUtil.checkDataJobExecutionStatus( - executionId, - DataJobExecution.StatusEnum.USER_ERROR, - opId, - jobName, - teamName, - username, - mockMvc); - } + // Check the data job execution status + JobExecutionUtil.checkDataJobExecutionStatus( + executionId, + DataJobExecution.StatusEnum.USER_ERROR, + opId, + jobName, + teamName, + username, + mockMvc); + } } diff --git a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/common/DataJobDeploymentExtension.java b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/common/DataJobDeploymentExtension.java index 9ec717c47f..acc88c5d69 100644 --- a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/common/DataJobDeploymentExtension.java +++ b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/common/DataJobDeploymentExtension.java @@ -126,7 +126,8 @@ public void beforeEach(ExtensionContext context) throws Exception { if (!initialized) { byte[] jobZipBinary = - IOUtils.toByteArray(getClass().getClassLoader().getResourceAsStream(JOB_SOURCE_PATH + jobSource)); + IOUtils.toByteArray( + getClass().getClassLoader().getResourceAsStream(JOB_SOURCE_PATH + jobSource)); // Upload the data job MvcResult uploadResult = diff --git a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/KubernetesService.java b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/KubernetesService.java index 6970cd4b3c..999ed6fd68 100644 --- a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/KubernetesService.java +++ b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/KubernetesService.java @@ -1654,7 +1654,7 @@ Optional getJobExecutionStatus(V1Job job, JobStatusCondition jobSt // omits events that come after the Data Job completion if (jobExecutionStatusBuilder.succeeded != null - && StringUtils.isBlank(jobExecutionStatusBuilder.containerTerminationReason)) { + && StringUtils.isBlank(jobExecutionStatusBuilder.containerTerminationReason)) { return Optional.empty(); } From 025b2ad7b514fb4c5352273bf576ae28753bf5fe Mon Sep 17 00:00:00 2001 From: Miroslav Ivanov Date: Fri, 3 Feb 2023 12:54:44 +0200 Subject: [PATCH 3/6] Fixed unit tests --- .../java/com/vmware/taurus/service/KubernetesServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/KubernetesServiceTest.java b/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/KubernetesServiceTest.java index 80c98ca908..d51749de36 100644 --- a/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/KubernetesServiceTest.java +++ b/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/KubernetesServiceTest.java @@ -174,7 +174,7 @@ public void testGetJobExecutionStatus_notEmptyJob_shouldReturnNotEmptyJobExecuti KubernetesService mock = Mockito.mock(KubernetesService.class); Mockito.when(mock.getK8sSupportsV1CronJob()).thenReturn(false); - Mockito.when(mock.getTerminationStatus(expectedJob)).thenReturn(Optional.empty()); + Mockito.when(mock.getTerminationStatus(expectedJob)).thenReturn(Optional.ofNullable(new V1ContainerStateTerminated().reason("test"))); Mockito.when(mock.getJobExecutionStatus(expectedJob, condition)).thenCallRealMethod(); Optional actualJobExecutionStatusOptional = mock.getJobExecutionStatus(expectedJob, condition); From 238cea3a57e7cf76f99ff6960ecf6456e819c9fa Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Fri, 3 Feb 2023 11:51:55 +0000 Subject: [PATCH 4/6] Google Java Format --- .../java/com/vmware/taurus/datajobs/it/DataJobOOMIT.java | 1 - .../java/com/vmware/taurus/service/KubernetesServiceTest.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobOOMIT.java b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobOOMIT.java index 49f4e38fb6..8beb55fcc7 100644 --- a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobOOMIT.java +++ b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobOOMIT.java @@ -16,7 +16,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.boot.test.context.SpringBootTest; - @Slf4j @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, diff --git a/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/KubernetesServiceTest.java b/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/KubernetesServiceTest.java index d51749de36..772b55cd00 100644 --- a/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/KubernetesServiceTest.java +++ b/projects/control-service/projects/pipelines_control_service/src/test/java/com/vmware/taurus/service/KubernetesServiceTest.java @@ -174,7 +174,8 @@ public void testGetJobExecutionStatus_notEmptyJob_shouldReturnNotEmptyJobExecuti KubernetesService mock = Mockito.mock(KubernetesService.class); Mockito.when(mock.getK8sSupportsV1CronJob()).thenReturn(false); - Mockito.when(mock.getTerminationStatus(expectedJob)).thenReturn(Optional.ofNullable(new V1ContainerStateTerminated().reason("test"))); + Mockito.when(mock.getTerminationStatus(expectedJob)) + .thenReturn(Optional.ofNullable(new V1ContainerStateTerminated().reason("test"))); Mockito.when(mock.getJobExecutionStatus(expectedJob, condition)).thenCallRealMethod(); Optional actualJobExecutionStatusOptional = mock.getJobExecutionStatus(expectedJob, condition); From 723ffb16a2c1ff7ea6cfaa53097ee0759715568b Mon Sep 17 00:00:00 2001 From: Miroslav Ivanov Date: Fri, 3 Feb 2023 14:00:33 +0200 Subject: [PATCH 5/6] Fixed integration tests --- .../com/vmware/taurus/datajobs/it/UploadSourceValidationIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/UploadSourceValidationIT.java b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/UploadSourceValidationIT.java index 28295963c3..1fd9d7978a 100644 --- a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/UploadSourceValidationIT.java +++ b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/UploadSourceValidationIT.java @@ -48,7 +48,7 @@ public void setup() throws Exception { @Test public void testDataJobUploadSource() throws Exception { byte[] jobZipBinary = - IOUtils.toByteArray(getClass().getClassLoader().getResourceAsStream("simple_job.zip")); + IOUtils.toByteArray(getClass().getClassLoader().getResourceAsStream("data_jobs/simple_job.zip")); mockMvc .perform( From 50ff8e632b0253e408eafd822c8a730667572dd6 Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Fri, 3 Feb 2023 12:01:53 +0000 Subject: [PATCH 6/6] Google Java Format --- .../vmware/taurus/datajobs/it/UploadSourceValidationIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/UploadSourceValidationIT.java b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/UploadSourceValidationIT.java index 1fd9d7978a..9c252f15df 100644 --- a/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/UploadSourceValidationIT.java +++ b/projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/UploadSourceValidationIT.java @@ -48,7 +48,8 @@ public void setup() throws Exception { @Test public void testDataJobUploadSource() throws Exception { byte[] jobZipBinary = - IOUtils.toByteArray(getClass().getClassLoader().getResourceAsStream("data_jobs/simple_job.zip")); + IOUtils.toByteArray( + getClass().getClassLoader().getResourceAsStream("data_jobs/simple_job.zip")); mockMvc .perform(