Skip to content

Commit c1d9ff0

Browse files
authored
Fix Kube Acceptance Tests and properly close the created database. (#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.
1 parent 04f34d7 commit c1d9ff0

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

airbyte-test-utils/src/main/java/io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ public void cleanup() {
293293
for (final UUID destinationId : destinationIds) {
294294
deleteDestination(destinationId);
295295
}
296+
destinationPsql.stop();
296297
} catch (final Exception e) {
297298
LOGGER.error("Error tearing down test fixtures:", e);
298299
}

airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AdvancedAcceptanceTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,9 @@ void testCheckpointing() throws Exception {
199199
// now cancel it so that we freeze state!
200200
try {
201201
apiClient.getJobsApi().cancelJob(new JobIdRequestBody().id(connectionSyncRead1.getJob().getId()));
202-
} catch (final Exception e) {}
202+
} catch (final Exception e) {
203+
LOGGER.error("error:", e);
204+
}
203205

204206
final ConnectionState connectionState = waitForConnectionState(apiClient, connectionId);
205207

kube/overlays/dev-integration-test/.env

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ JOB_MAIN_CONTAINER_CPU_LIMIT=
5454
JOB_MAIN_CONTAINER_MEMORY_REQUEST=
5555
JOB_MAIN_CONTAINER_MEMORY_LIMIT=
5656

57+
NORMALIZATION_JOB_MAIN_CONTAINER_MEMORY_LIMIT=
58+
NORMALIZATION_JOB_MAIN_CONTAINER_MEMORY_REQUEST=
59+
NORMALIZATION_JOB_MAIN_CONTAINER_CPU_LIMIT=
60+
NORMALIZATION_JOB_MAIN_CONTAINER_CPU_REQUEST=
61+
5762
# Worker pod tolerations, annotations and node selectors
5863
JOB_KUBE_TOLERATIONS=
5964
JOB_KUBE_ANNOTATIONS=
@@ -64,6 +69,7 @@ JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_POLICY=
6469

6570
# Launch a separate pod to orchestrate sync steps
6671
CONTAINER_ORCHESTRATOR_ENABLED=true
72+
CONTAINER_ORCHESTRATOR_IMAGE=
6773

6874
# Open Telemetry Configuration
6975
METRIC_CLIENT=

kube/overlays/stable/.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ JOB_KUBE_MAIN_CONTAINER_IMAGE_PULL_POLICY=
7171

7272
# Launch a separate pod to orchestrate sync steps
7373
CONTAINER_ORCHESTRATOR_ENABLED=true
74+
CONTAINER_ORCHESTRATOR_IMAGE=
7475

7576
# Open Telemetry Configuration
7677
METRIC_CLIENT=

0 commit comments

Comments
 (0)