From c175a0de2f05d37c1c774684318a525eb96bb59b Mon Sep 17 00:00:00 2001 From: Avi Ziv Date: Thu, 15 Mar 2018 13:21:44 +0200 Subject: Create on boarding docker Add BE and Cassandra init docker images Change-Id: Id9d767c73fc946819cec821b4634ce650cbb22fd Issue-ID: SDC-781 Signed-off-by: Michael Lando --- ui-ci/pom.xml | 1 - .../sdc-ui-tests/templates/default/sdc-sanity.yaml.erb | 14 +++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'ui-ci') diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml index 9317bccff7..94a8c99a19 100644 --- a/ui-ci/pom.xml +++ b/ui-ci/pom.xml @@ -427,7 +427,6 @@ ${project.basedir}/sdc-ui-tests ${docker.tag} - ${docker.latest.tag} ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest 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 98c3dc8b7e..70063e00d5 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,12 +1,24 @@ url: http://<%= @webportal_ip %>:8285/sdc1 browser: firefox uiSimulator: true -sdcHttpMethod: http + 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] %> +<% else %> +sdcHttpMethod: http +onboardingBePort: <%= node['ONBOARDING_BE'][:http_port] %> +<% end -%> + + + + esHost: <%= @ES_IP %> esPort: 9200 disributionClientHost: disClient -- cgit 1.2.3-korg