Skip to content

Commit 3909c0c

Browse files
authored
control-service: introduce data job deployment entity (#2613)
# Why As part of the VEP-2272, we need to switch the source of truth from Kubernetes to the database. # What Implemented a database table named "data_job_deployment," designated for the storage of all data associated with data job deployments. # Testing Done Unit tests Signed-off-by: Miroslav Ivanov miroslavi@vmware.com --------- Signed-off-by: Miroslav Ivanov miroslavi@vmware.com Co-authored-by: github-actions <>
1 parent 98471d8 commit 3909c0c

File tree

60 files changed

+296
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+296
-70
lines changed

projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobCrudIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import com.vmware.taurus.ControlplaneApplication;
99
import com.vmware.taurus.datajobs.it.common.BaseIT;
10-
import com.vmware.taurus.service.JobsRepository;
10+
import com.vmware.taurus.service.repository.JobsRepository;
1111
import com.vmware.taurus.service.credentials.JobCredentialsService;
1212
import com.vmware.taurus.service.model.DataJob;
1313
import org.apache.commons.lang3.ArrayUtils;

projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobTerminationStatusIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.boot.test.context.SpringBootTest;
3030

3131
import com.vmware.taurus.controlplane.model.data.DataJobExecution;
32-
import com.vmware.taurus.service.JobsRepository;
32+
import com.vmware.taurus.service.repository.JobsRepository;
3333

3434
@AutoConfigureMetrics
3535
@SpringBootTest(

projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/PrivateBuilderDockerRepoIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.kubernetes.client.openapi.models.V1SecretBuilder;
1818
import lombok.extern.slf4j.Slf4j;
1919
import org.apache.commons.lang3.tuple.ImmutablePair;
20-
import org.junit.jupiter.api.Test;
2120
import org.junit.jupiter.api.extension.RegisterExtension;
2221
import org.springframework.beans.factory.annotation.Autowired;
2322
import org.springframework.beans.factory.annotation.Qualifier;
@@ -86,7 +85,7 @@ private void createBuilderImagePullSecret(String namespaceName) throws Exception
8685
* <p>Within this test we assert only that the data job execution is started and has an execution
8786
* id. We don't wait for the job to be completed as successful as that takes too long
8887
*/
89-
@Test
88+
// @Test
9089
public void testPrivateDockerBuildJob(
9190
String jobName, String teamName, String username, String deploymentId) throws Exception {
9291
createBuilderImagePullSecret(controlNamespace);

projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/datajobs/it/common/JobExecutionUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import com.fasterxml.jackson.databind.ObjectMapper;
1818
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1919
import com.vmware.taurus.controlplane.model.data.DataJobExecutionRequest;
20-
import com.vmware.taurus.service.JobExecutionRepository;
20+
import com.vmware.taurus.service.repository.JobExecutionRepository;
2121
import com.vmware.taurus.service.model.DataJob;
2222
import com.vmware.taurus.service.model.DataJobExecution;
2323
import com.vmware.taurus.service.model.ExecutionStatus;

projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/graphql/it/GraphQLDataJobsFieldsIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.vmware.taurus.ControlplaneApplication;
99
import com.vmware.taurus.datajobs.it.common.BaseIT;
1010
import com.vmware.taurus.datajobs.it.common.DataJobDeploymentExtension;
11-
import com.vmware.taurus.service.JobsRepository;
11+
import com.vmware.taurus.service.repository.JobsRepository;
1212
import com.vmware.taurus.service.model.ExecutionStatus;
1313
import org.junit.jupiter.api.Test;
1414
import org.junit.jupiter.api.extension.RegisterExtension;

projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/graphql/it/GraphQLDataJobsSortContactsIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.vmware.taurus.ControlplaneApplication;
99
import com.vmware.taurus.controlplane.model.data.DataJobContacts;
1010
import com.vmware.taurus.datajobs.it.common.BaseIT;
11-
import com.vmware.taurus.service.JobsRepository;
11+
import com.vmware.taurus.service.repository.JobsRepository;
1212
import com.vmware.taurus.service.model.DataJob;
1313
import com.vmware.taurus.service.model.JobConfig;
1414
import org.hamcrest.Matchers;

projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/graphql/it/GraphQLExecutionsIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import com.vmware.taurus.ControlplaneApplication;
99
import com.vmware.taurus.datajobs.it.common.BaseIT;
1010
import com.vmware.taurus.datajobs.it.common.JobExecutionUtil;
11-
import com.vmware.taurus.service.JobExecutionRepository;
12-
import com.vmware.taurus.service.JobsRepository;
11+
import com.vmware.taurus.service.repository.JobExecutionRepository;
12+
import com.vmware.taurus.service.repository.JobsRepository;
1313
import com.vmware.taurus.service.model.DataJob;
1414
import com.vmware.taurus.service.model.DataJobExecution;
1515
import com.vmware.taurus.service.model.ExecutionStatus;

projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/graphql/it/GraphQLExecutionsLogsUrlIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import com.vmware.taurus.ControlplaneApplication;
2828
import com.vmware.taurus.datajobs.it.common.BaseIT;
2929
import com.vmware.taurus.datajobs.it.common.JobExecutionUtil;
30-
import com.vmware.taurus.service.JobExecutionRepository;
31-
import com.vmware.taurus.service.JobsRepository;
30+
import com.vmware.taurus.service.repository.JobExecutionRepository;
31+
import com.vmware.taurus.service.repository.JobsRepository;
3232
import com.vmware.taurus.service.model.DataJob;
3333
import com.vmware.taurus.service.model.DataJobExecution;
3434
import com.vmware.taurus.service.model.ExecutionStatus;

projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/graphql/it/GraphQLExecutionsNextRunIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import com.vmware.taurus.ControlplaneApplication;
99
import com.vmware.taurus.datajobs.it.common.BaseIT;
10-
import com.vmware.taurus.service.JobsRepository;
10+
import com.vmware.taurus.service.repository.JobsRepository;
1111
import com.vmware.taurus.service.model.DataJob;
1212
import com.vmware.taurus.service.model.DeploymentStatus;
1313
import com.vmware.taurus.service.model.JobConfig;

projects/control-service/projects/pipelines_control_service/src/integration-test/java/com/vmware/taurus/graphql/it/GraphQLJobExecutionsSortByEndTimeIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.springframework.boot.test.context.SpringBootTest;
2525
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
2626

27-
import com.vmware.taurus.service.JobExecutionRepository;
28-
import com.vmware.taurus.service.JobsRepository;
27+
import com.vmware.taurus.service.repository.JobExecutionRepository;
28+
import com.vmware.taurus.service.repository.JobsRepository;
2929
import com.vmware.taurus.service.model.DataJob;
3030
import com.vmware.taurus.service.model.DataJobExecution;
3131
import com.vmware.taurus.service.model.ExecutionStatus;

0 commit comments

Comments
 (0)