From cda377611eb078acef6788c082eece9b46024aba Mon Sep 17 00:00:00 2001
From: "waqas.ikram" <waqas.ikram@est.tech>
Date: Thu, 29 Aug 2019 15:38:15 +0000
Subject: Fixing so-csit-integration tests

Change-Id: Ic74cb89c61260c6fdcec98478b92f5cd31060131
Issue-ID: INT-1229
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
---
 plans/so/integration-testing/.gitignore         |  2 +
 plans/so/integration-testing/docker-compose.yml | 67 +++++++++++++------------
 2 files changed, 37 insertions(+), 32 deletions(-)
 create mode 100644 plans/so/integration-testing/.gitignore

diff --git a/plans/so/integration-testing/.gitignore b/plans/so/integration-testing/.gitignore
new file mode 100644
index 00000000..0464a8da
--- /dev/null
+++ b/plans/so/integration-testing/.gitignore
@@ -0,0 +1,2 @@
+test_lab
+**/test_lab/**
diff --git a/plans/so/integration-testing/docker-compose.yml b/plans/so/integration-testing/docker-compose.yml
index 7273c4e4..cca52f9a 100644
--- a/plans/so/integration-testing/docker-compose.yml
+++ b/plans/so/integration-testing/docker-compose.yml
@@ -29,10 +29,11 @@ services:
       - APP=catalog-db-adapter
       - JVM_ARGS=-Xms64m -Xmx512m
       - DB_HOST=mariadb
-#     - KEYSTORE=msoClientKeyStore-onapheat.jks
-#     - KEYSTORE_PASSWORD=password
-#     - TRUSTSTORE=msoTrustStore.jks
-#     - TRUSTSTORE_PASSWORD=password
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
     hostname:
       catalog-db-adapter.so.testlab.onap.org
     depends_on:
@@ -62,10 +63,11 @@ services:
       - APP=request-db-adapter
       - JVM_ARGS=-Xms64m -Xmx512m
       - DB_HOST=mariadb
-#     - KEYSTORE=msoClientKeyStore-onapheat.jks
-#     - KEYSTORE_PASSWORD=password
-#     - TRUSTSTORE=msoTrustStore.jks
-#     - TRUSTSTORE_PASSWORD=password
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
     hostname:
       request-db-adapter.so.testlab.onap.org
     depends_on:
@@ -96,10 +98,6 @@ services:
       - APP=sdnc-adapter
       - JVM_ARGS=-Xms64m -Xmx512m
       - DB_HOST=mariadb
-#     - KEYSTORE=msoClientKeyStore-onapheat.jks
-#     - KEYSTORE_PASSWORD=password
-#     - TRUSTSTORE=msoTrustStore.jks
-#     - TRUSTSTORE_PASSWORD=password
     hostname:
       sdnc-adapter.so.testlab.onap.org
     depends_on:
@@ -131,10 +129,11 @@ services:
       - APP=openstack-adapter
       - JVM_ARGS=-Xms64m -Xmx512m
       - DB_HOST=mariadb
-#     - KEYSTORE=msoClientKeyStore-onapheat.jks
-#     - KEYSTORE_PASSWORD=password
-#     - TRUSTSTORE=msoTrustStore.jks
-#     - TRUSTSTORE_PASSWORD=password
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
     hostname:
       openstack-adapter.so.testlab.onap.org
     depends_on:
@@ -166,10 +165,11 @@ services:
       - APP=vfc-adapter
       - JVM_ARGS=-Xms64m -Xmx512m
       - DB_HOST=mariadb
-#     - KEYSTORE=msoClientKeyStore-onapheat.jks
-#     - KEYSTORE_PASSWORD=password
-#     - TRUSTSTORE=msoTrustStore.jks
-#     - TRUSTSTORE_PASSWORD=password
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
     hostname:
       vfc-adapter.so.testlab.onap.org
     depends_on:
@@ -201,10 +201,11 @@ services:
       - APP=sdc-controller
       - JVM_ARGS=-Xms64m -Xmx512m
       - DB_HOST=mariadb
-#     - KEYSTORE=msoClientKeyStore-onapheat.jks
-#     - KEYSTORE_PASSWORD=password
-#     - TRUSTSTORE=msoTrustStore.jks
-#     - TRUSTSTORE_PASSWORD=password
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
     hostname:
       sdc-controller.so.testlab.onap.org
     depends_on:
@@ -236,10 +237,11 @@ services:
       - APP=bpmn-infra
       - JVM_ARGS=-Xms64m -Xmx512m
       - DB_HOST=mariadb
-#     - KEYSTORE=msoClientKeyStore-onapheat.jks
-#     - KEYSTORE_PASSWORD=password
-#     - TRUSTSTORE=msoTrustStore.jks
-#     - TRUSTSTORE_PASSWORD=password
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
     hostname:
       bpmn-infra.so.testlab.onap.org
     depends_on:
@@ -271,10 +273,11 @@ services:
       - APP=api-handler-infra
       - JVM_ARGS=-Xms64m -Xmx512m
       - DB_HOST=mariadb
-#     - KEYSTORE=msoClientKeyStore-onapheat.jks
-#     - KEYSTORE_PASSWORD=password
-#     - TRUSTSTORE=msoTrustStore.jks
-#     - TRUSTSTORE_PASSWORD=password
+      - DB_PORT=3306
+      - DB_USERNAME=so_user
+      - DB_PASSWORD=so_User123
+      - DB_ADMIN_USERNAME=so_admin
+      - DB_ADMIN_PASSWORD=so_Admin123
     hostname:
       api-handler-infra.so.testlab.onap.org
     depends_on:
-- 
cgit 1.2.3-korg