Skip to content

control-service: better error logging and pull private image in private test #2156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
murphp15 merged 3 commits into from
May 30, 2023
Merged

control-service: better error logging and pull private image in private test #2156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aef40a2
control-service: use public image from github repo
murphp15 May 19, 2023
c78b8e3
control-service: better error logging
murphp15 May 30, 2023
6abf366
Google Java Format
May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions ...vice/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobDeploymentCrudIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,20 +106,27 @@ public void testDataJobDeploymentCrud() throws Exception {
.andExpect(status().isUnauthorized());

// Execute job upload with proper user
MvcResult jobUploadResult =
var jobUploadResult =
mockMvc
.perform(
post(String.format(
"/data-jobs/for-team/%s/jobs/%s/sources", TEST_TEAM_NAME, testJobName))
.with(user("user"))
.content(jobZipBinary)
.contentType(MediaType.APPLICATION_OCTET_STREAM))
.andExpect(status().isOk())
.andReturn();
.andReturn()
.getResponse();

if (jobUploadResult.getStatus() != 200) {
throw new Exception(
"status is "
+ jobUploadResult.getStatus()
+ "\nbody is "
+ jobUploadResult.getContentAsString());
}

DataJobVersion testDataJobVersion =
new ObjectMapper()
.readValue(jobUploadResult.getResponse().getContentAsString(), DataJobVersion.class);
new ObjectMapper().readValue(jobUploadResult.getContentAsString(), DataJobVersion.class);
Assertions.assertNotNull(testDataJobVersion);

String testJobVersionSha = testDataJobVersion.getVersionSha();
Expand Down
2 changes: 1 addition & 1 deletion ...nes_control_service/src/integration-test/resources/application-private-builder.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
datajobs.builder.registrySecret=integration-test-docker-pull-secret
datajobs.builder.registrySecret.content.testOnly=${BUILDER_TEST_REGISTRY_SECRET}
datajobs.builder.image=${DOCKER_REGISTRY_URL}/versatiledatakit/job-builder:1.3.3
datajobs.builder.image=${DOCKER_REGISTRY_URL}/versatiledatakit/job-builder-private:1.3.3
datajobs.deployment.dataJobBaseImage=ghcr.io/versatile-data-kit-dev/dp/versatiledatakit/data-job-base-python-3.7:latest