aboutsummaryrefslogtreecommitdiffstats
path: root/ui-ci/sdc-ui-tests/chef-repo
diff options
context:
space:
mode:
Diffstat (limited to 'ui-ci/sdc-ui-tests/chef-repo')
-rw-r--r--ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/org.onap.sdc.trust.jksbin0 -> 1413 bytes
-rw-r--r--ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/startTest.sh4
-rw-r--r--ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_1_setup_env.rb17
-rw-r--r--ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb4
-rw-r--r--ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/sdc-sanity.yaml.erb22
5 files changed, 35 insertions, 12 deletions
diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/org.onap.sdc.trust.jks b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/org.onap.sdc.trust.jks
new file mode 100644
index 0000000000..d07ce1a66b
--- /dev/null
+++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/org.onap.sdc.trust.jks
Binary files differ
diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/startTest.sh b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/startTest.sh
index f013bcf2cf..c4415578ee 100644
--- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/startTest.sh
+++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/startTest.sh
@@ -4,6 +4,10 @@ RERUN=false
debug_port=8000
TEST_SUITES=testSuites
fileName=testng-failed.xml
+JAVA_OPTIONS="${JAVA_OPTIONS} \
+ -Djavax.net.ssl.trustStore=/var/lib/tests/etc/org.onap.sdc.trust.jks \
+ -Dtestng.show.stack.frames=true \
+ "
function help_usage ()
{
diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_1_setup_env.rb b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_1_setup_env.rb
index 112cc4c2e7..61d0133888 100644
--- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_1_setup_env.rb
+++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_1_setup_env.rb
@@ -46,4 +46,19 @@ tests_base="/var/lib/tests"
group 'root'
mode '0755'
action :create
- end \ No newline at end of file
+ end
+
+ directory "create_etc_dir" do
+ path "/var/lib/tests/etc"
+ owner 'root'
+ group 'root'
+ mode '0755'
+ action :create
+ end
+
+cookbook_file "/var/lib/tests/etc/org.onap.sdc.trust.jks" do
+ source "org.onap.sdc.trust.jks"
+ owner "root"
+ group "root"
+ mode 0644
+end \ No newline at end of file
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 04a65413f5..50a953081a 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
@@ -7,9 +7,9 @@ template "sdc-yaml-config" do
group "root"
mode "0755"
variables ({
- :catalogBE_ip => node['Nodes']['BE'],
+ :catalogBE_host => node['Nodes']['BE'],
:catalogBE_port => node['BE'][:http_port],
- :webportal_ip => node['Nodes']['FE'],
+ :webportal_host => node['Nodes']['FE'],
:webportal_port => node['FE'][:http_port],
:janusgraph_file => "#{tests_base}/conf/janusgraph.properties",
:tests_base_ci => "#{tests_base}/CI/tests",
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 c8a3258625..23d0abcdda 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
@@ -1,24 +1,28 @@
-url: http://<%= @webportal_ip %>:8285/sdc1
browser: firefox
uiSimulator: true
-catalogBeHost: <%= @catalogBE_ip %>
-catalogBePort: <%= @catalogBE_port %>
-catalogFeHost: <%= @webportal_ip %>
-catalogFePort: <%= @webportal_port %>
-onboardingBeHost: <%= node['ONBOARDING_BE_VIP'] %>
<% if node[:disableHttp] -%>
sdcHttpMethod: https
onboardingBePort: <%= node['ONBOARDING_BE'][:https_port] %>
+onboardingBeHost: <%= node['ONBOARDING_BE'][:domain_name] %>
+url: https://<%= node['FE'][:domain_name] %>:8286/sdc1
+catalogBeHost: <%= node['BE'][:domain_name] %>
+catalogBePort: <%= node['BE'][:https_port] %>
+catalogFeHost: <%= node['FE'][:domain_name] %>
+catalogFePort: <%= node['FE'][:https_port] %>
<% else %>
sdcHttpMethod: http
onboardingBePort: <%= node['ONBOARDING_BE'][:http_port] %>
+onboardingBeHost: <%= node['ONBOARDING_BE_VIP'] %>
+url: http://<%= @webportal_host %>:8285/sdc1
+catalogBeHost: <%= @catalogBE_host %>
+catalogBePort: <%= @catalogBE_port %>
+catalogFeHost: <%= @webportal_host %>
+catalogFePort: <%= @webportal_port %>
<% end -%>
-
-
esHost: <%= @ES_IP %>
esPort: 9200
disributionClientHost: disClient
@@ -40,4 +44,4 @@ importResourceTestsConfigDir: <%= @importResourceTestsConfigDir %>
errorConfigurationFile: <%= @errorConfigurationFile %>
configurationFile: <%= @ConfigurationFile %>
importTypesConfigDir: <%= @importTypesDir %>
-janusGraphPropertiesFile: <%= @janusgraph_file %> \ No newline at end of file
+janusGraphPropertiesFile: <%= @janusgraph_file %>