From c1d9ff0c7cf59e233bdf016d5ed6a6f3a598a4b8 Mon Sep 17 00:00:00 2001
From: Davin Chia <davinchia@gmail.com>
Date: Thu, 11 Aug 2022 21:58:00 -0700
Subject: [PATCH] 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.
---
 .../io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java | 1 +
 .../io/airbyte/test/acceptance/AdvancedAcceptanceTests.java | 4 +++-
 kube/overlays/dev-integration-test/.env                     | 6 ++++++
 kube/overlays/stable/.env                                   | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/airbyte-test-utils/src/main/java/io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java b/airbyte-test-utils/src/main/java/io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java
index 333b264dfe381..c85f034e1a11a 100644
--- a/airbyte-test-utils/src/main/java/io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java
+++ b/airbyte-test-utils/src/main/java/io/airbyte/test/utils/AirbyteAcceptanceTestHarness.java
@@ -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);
     }
diff --git a/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AdvancedAcceptanceTests.java b/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AdvancedAcceptanceTests.java
index 35c0db1de9c57..87a9f67a0e09c 100644
--- a/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AdvancedAcceptanceTests.java
+++ b/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AdvancedAcceptanceTests.java
@@ -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);
 
diff --git a/kube/overlays/dev-integration-test/.env b/kube/overlays/dev-integration-test/.env
index 64612ea1aa4d4..ada7a851bf34d 100644
--- a/kube/overlays/dev-integration-test/.env
+++ b/kube/overlays/dev-integration-test/.env
@@ -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=
@@ -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=
diff --git a/kube/overlays/stable/.env b/kube/overlays/stable/.env
index e1b01c39f2704..a410638647ba4 100644
--- a/kube/overlays/stable/.env
+++ b/kube/overlays/stable/.env
@@ -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=