diff options
| author |   Daniel Rose <dr695h@att.com> | 2019-08-29 17:35:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-08-29 17:35:09 +0000 |
| commit | 5b8c4f931930cde88eceba2059785dec7f6352f0 (patch) | |
| tree | fd029f535572fed44cf3e0410135f79e76bbb681 | |
| parent | 4c17010ff2bae807c8a6b08f5422bf53109dacaf (diff) | |
| parent | cda377611eb078acef6788c082eece9b46024aba (diff) | |
Merge "Fixing so-csit-integration tests"
| -rw-r--r-- | plans/so/integration-testing/.gitignore | 2 | ||||
| -rw-r--r-- | plans/so/integration-testing/docker-compose.yml | 67 |
2 files changed, 37 insertions, 32 deletions
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: |