diff options
| author |   Tal Gitelman <tg851x@intl.att.com> | 2017-12-10 18:55:03 +0200 |
|---|---|---|
| committer | Tal Gitelman <tg851x@intl.att.com> | 2017-12-10 19:33:38 +0200 |
| commit | 51d50f0ef642e0f996a1c8b8d2ef4838bdfec892 (patch) | |
| tree | 3ac236a864d74d19b0f5c9020891a7a7e5c31b44 /test-apis-ci/src/main/resources | |
| parent | b5cc2e0695f195716d6ccdc65e73807a6632ec70 (diff) | |
Final commit to master merge from
Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507
Issue-ID: SDC-714
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'test-apis-ci/src/main/resources')
4 files changed, 15 insertions, 4 deletions
diff --git a/test-apis-ci/src/main/resources/ci/conf/attsdc.yaml b/test-apis-ci/src/main/resources/ci/conf/attsdc.yaml index 10402eb2b0..904b3d1327 100644 --- a/test-apis-ci/src/main/resources/ci/conf/attsdc.yaml +++ b/test-apis-ci/src/main/resources/ci/conf/attsdc.yaml @@ -2,6 +2,12 @@ outputFolder: target reportName: index.html catalogBeHost: localhost catalogFeHost: fehost +#QA-SCRUM1 +#catalogBeHost: 135.21.125.97 +#catalogFeHost: 135.21.125.89 +#Automate +#catalogBeHost: 135.63.125.67 +#catalogFeHost: 135.63.125.63 esHost: eshost disributionClientHost: disClient catalogFePort: 8181 @@ -14,7 +20,7 @@ neoPort: 7474 neoDBusername: neo4j neoDBpassword: 123456 windowsDownloadDirectory: "c:\\apache-ftpserver-1.1.0\\res\\home" - +systemUnderDebug: false resourceConfigDir: src/test/resources/CI/tests componentsConfigDir: src/test/resources/CI/components importResourceConfigDir: ../catalog-be/src/main/resources/import/tosca/capability-types diff --git a/test-apis-ci/src/main/resources/ci/conf/titan.properties b/test-apis-ci/src/main/resources/ci/conf/titan.properties index 42e1998f89..5411a44224 100644 --- a/test-apis-ci/src/main/resources/ci/conf/titan.properties +++ b/test-apis-ci/src/main/resources/ci/conf/titan.properties @@ -1,8 +1,11 @@ storage.backend=cassandra -#storage.hostname=cassandrahost storage.hostname=localhost storage.port=9160 cache.db-cache = false +cache.db-cache-clean-wait = 20 +cache.db-cache-time = 180000 +cache.db-cache-size = 0.5 - +cache.tx-cache-size = 500000 +storage.cassandra.keyspace=sdctitan diff --git a/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml b/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml index 275d07e426..d32839bdb7 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/externalAPIs.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="externalApis" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="2" data-provider-thread-count="2"> +<suite name="externalApis" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="1" data-provider-thread-count="1"> <test name="ExternalApis"> <classes> diff --git a/test-apis-ci/src/main/resources/ci/testSuites/onap.xml b/test-apis-ci/src/main/resources/ci/testSuites/onap.xml index 1d5bc4b1bf..4aad3681c9 100644 --- a/test-apis-ci/src/main/resources/ci/testSuites/onap.xml +++ b/test-apis-ci/src/main/resources/ci/testSuites/onap.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> <suite name="externalApis" configfailurepolicy="continue" verbose="2" parallel="methods" thread-count="1" data-provider-thread-count="1"> + <parameter name="makeDistribution" value="false"/> + <parameter name="makeToscaValidation" value="true"/> <test name="ExternalApis"> <classes> |