From: Ruslan Kashapov <ruslan.kashapov@pantheon.tech>
Date: Mon, 28 Dec 2020 08:14:41 +0000 (+0200)
Subject: Fix test container remain in docker after tests completion. IMPORTANT.
X-Git-Tag: 0.0.1~75^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=191b09ce5d3efcb96cc7bf8468ab62626ad62a34;p=cps.git

Fix test container remain in docker after tests completion. IMPORTANT.

Issue-ID: CPS-124
Change-Id: I6e423792c1a63d0f828577ca01d32366d2e693bb
Signed-off-by: Ruslan Kashapov <ruslan.kashapov@pantheon.tech>
---

diff --git a/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java b/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java
index 759cc95319..a621b2ca4d 100644
--- a/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java
+++ b/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java
@@ -44,6 +44,7 @@ public class DatabaseTestContainer extends PostgreSQLContainer<DatabaseTestConta
     public static DatabaseTestContainer getInstance() {
         if (databaseTestContainer == null) {
             databaseTestContainer = new DatabaseTestContainer();
+            Runtime.getRuntime().addShutdownHook(new Thread(databaseTestContainer::terminate));
         }
         return databaseTestContainer;
     }
@@ -58,7 +59,10 @@ public class DatabaseTestContainer extends PostgreSQLContainer<DatabaseTestConta
 
     @Override
     public void stop() {
-        //do nothing, JVM handles shut down
+        // do nothing on test completion, image removal will be performed via terminate() on JVM shutdown
     }
 
+    private void terminate() {
+        super.stop();
+    }
 }