Skip to content

Commit

Permalink
Fix Kube Acceptance Tests and properly close the created database. (#…
Browse files Browse the repository at this point in the history
…15587)

Bug fix from #14310 . The build was broken then from before #15497 so this was hidden.

- Add the new env vars to the integration test yamls.
- Also make sure to properly close the destination test container db.
  • Loading branch information
davinchia authored Aug 12, 2022
1 parent 04f34d7 commit c1d9ff0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ public void cleanup() {
for (final UUID destinationId : destinationIds) {
deleteDestination(destinationId);
}
destinationPsql.stop();
} catch (final Exception e) {
LOGGER.error("Error tearing down test fixtures:", e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,9 @@ void testCheckpointing() throws Exception {
// now cancel it so that we freeze state!
try {
apiClient.getJobsApi().cancelJob(new JobIdRequestBody().id(connectionSyncRead1.getJob().getId()));
} catch (final Exception e) {}
} catch (final Exception e) {
LOGGER.error("error:", e);
}

final ConnectionState connectionState = waitForConnectionState(apiClient, connectionId);

Expand Down
6 changes: 6 additions & 0 deletions kube/overlays/dev-integration-test/.env
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ JOB_MAIN_CONTAINER_CPU_LIMIT=
JOB_MAIN_CONTAINER_MEMORY_REQUEST=
JOB_MAIN_CONTAINER_MEMORY_LIMIT=

NORMALIZATION_JOB_MAIN_CONTAINER_MEMORY_LIMIT=
NORMALIZATION_JOB_MAIN_CONTAINER_MEMORY_REQUEST=
NORMALIZATION_JOB_MAIN_CONTAINER_CPU_LIMIT=
NORMALIZATION_JOB_MAIN_CONTAINER_CPU_REQUEST=

# Worker pod tolerations, annotations and node selectors
JOB_KUBE_TOLERATIONS=
JOB_KUBE_ANNOTATIONS=
Expand All @@ -64,6 +69,7 @@ JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_POLICY=

# Launch a separate pod to orchestrate sync steps
CONTAINER_ORCHESTRATOR_ENABLED=true
CONTAINER_ORCHESTRATOR_IMAGE=

# Open Telemetry Configuration
METRIC_CLIENT=
Expand Down
1 change: 1 addition & 0 deletions kube/overlays/stable/.env
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_POLICY=

# Launch a separate pod to orchestrate sync steps
CONTAINER_ORCHESTRATOR_ENABLED=true
CONTAINER_ORCHESTRATOR_IMAGE=

# Open Telemetry Configuration
METRIC_CLIENT=
Expand Down

0 comments on commit c1d9ff0

Please sign in to comment.