diff options
Diffstat (limited to 'ui-ci')
| -rw-r--r-- | ui-ci/pom.xml | 25 | ||||
| -rw-r--r-- | ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j.properties | 2 | ||||
| -rw-r--r-- | ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb | 8 | ||||
| -rw-r--r-- | ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-janusgraph.properties.erb (renamed from ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-titan.properties.erb) | 0 | ||||
| -rw-r--r-- | ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/sdc-sanity.yaml.erb | 2 | ||||
| -rw-r--r-- | ui-ci/src/main/resources/ci/conf/attsdc.yaml | 4 | ||||
| -rw-r--r-- | ui-ci/src/main/resources/ci/conf/log4j.properties | 2 |
7 files changed, 9 insertions, 34 deletions
diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml index be40b0497c..afaf49143b 100644 --- a/ui-ci/pom.xml +++ b/ui-ci/pom.xml @@ -144,31 +144,6 @@ <scope>compile</scope> </dependency> - <!-- TITAN --> - <dependency> - <groupId>com.thinkaurelius.titan</groupId> - <artifactId>titan-core</artifactId> - <version>${titan.version}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - </exclusion> - <exclusion> - <artifactId>groovy</artifactId> - <groupId>org.codehaus.groovy</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.onap.sdc.sdc-titan-cassandra</groupId> - <artifactId>sdc-titan-cassandra</artifactId> - <version>${sdc.titan.version}</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j.properties b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j.properties index d313e92b55..02f783076a 100644 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j.properties +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j.properties @@ -26,7 +26,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n log4j.logger.org.apache.cassandra.service.StorageProxy=INFO -log4j.logger.com.thinkaurelius.titan.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout +log4j.logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout log4j.logger.org.openecomp.sdc.ci.tests.utils=INFO, FILE, stdout log4j.additivity.org.openecomp.sdc.ci.tests.utils=false diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb index 1d4c6d6f6c..04a65413f5 100644 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb @@ -11,7 +11,7 @@ template "sdc-yaml-config" do :catalogBE_port => node['BE'][:http_port], :webportal_ip => node['Nodes']['FE'], :webportal_port => node['FE'][:http_port], - :titan_file => "#{tests_base}/conf/titan.properties", + :janusgraph_file => "#{tests_base}/conf/janusgraph.properties", :tests_base_ci => "#{tests_base}/CI/tests", :components_path => "#{tests_base}/CI/components", :importResourceConfigDir => "#{tests_base}/CI/importResource", @@ -26,9 +26,9 @@ template "sdc-yaml-config" do }) end -template "titan.properties" do - path "/#{tests_base}/conf/titan.properties" - source "BE-titan.properties.erb" +template "janusgraph.properties" do + path "/#{tests_base}/conf/janusgraph.properties" + source "BE-janusgraph.properties.erb" owner "root" group "root" mode "0755" diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-titan.properties.erb b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-janusgraph.properties.erb index a42c7bf206..a42c7bf206 100644 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-titan.properties.erb +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-janusgraph.properties.erb diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/sdc-sanity.yaml.erb b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/sdc-sanity.yaml.erb index 70063e00d5..c8a3258625 100644 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/sdc-sanity.yaml.erb +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/sdc-sanity.yaml.erb @@ -40,4 +40,4 @@ importResourceTestsConfigDir: <%= @importResourceTestsConfigDir %> errorConfigurationFile: <%= @errorConfigurationFile %> configurationFile: <%= @ConfigurationFile %> importTypesConfigDir: <%= @importTypesDir %> -titanPropertiesFile: <%= @titan_file %>
\ No newline at end of file +janusGraphPropertiesFile: <%= @janusgraph_file %>
\ No newline at end of file diff --git a/ui-ci/src/main/resources/ci/conf/attsdc.yaml b/ui-ci/src/main/resources/ci/conf/attsdc.yaml index e6790939cf..36018d7b7f 100644 --- a/ui-ci/src/main/resources/ci/conf/attsdc.yaml +++ b/ui-ci/src/main/resources/ci/conf/attsdc.yaml @@ -45,13 +45,13 @@ localDataCenter: DC-Automate01 useBrowserMobProxy: false captureTraffic: false -titanPropertiesFile: src/main/resources/ci/conf/titan.properties +janusGraphPropertiesFile: src/main/resources/ci/conf/janusgraph.properties stopOnClassFailure: false #todo onboardingBeHost: 192.168.33.10 onboardingBePort: 8080 -#List of non-abstract resources to keep during titan cleanup between tests +#List of non-abstract resources to keep during JanusGraph cleanup between tests #Only 1.0 version will be kept resourcesNotToDelete: - tosca.nodes.Compute diff --git a/ui-ci/src/main/resources/ci/conf/log4j.properties b/ui-ci/src/main/resources/ci/conf/log4j.properties index 3e159ec8df..0bdf0fad8c 100644 --- a/ui-ci/src/main/resources/ci/conf/log4j.properties +++ b/ui-ci/src/main/resources/ci/conf/log4j.properties @@ -26,7 +26,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG -log4j.logger.com.thinkaurelius.titan.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout +log4j.logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout log4j.logger.org.openecomp.sdc.ci.tests.utils=TRACE, FILE, stdout log4j.additivity.org.openecomp.sdc.ci.tests.utils=false |