diff options
| author |   Michael Lando <ml636r@att.com> | 2018-03-04 14:53:33 +0200 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-03-07 13:19:05 +0000 |
| commit | a5445100050e49e83f73424198d73cd72d672a4d (patch) | |
| tree | cacf4df817df31be23e4e790d1dda857bdae061e /sdc-os-chef/sdc-sanity/chef-repo/cookbooks | |
| parent | 51157f92c21976cba4914c378aaa3cba49826931 (diff) | |
Sync Integ to Master
Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74
Issue-ID: SDC-977
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
Diffstat (limited to 'sdc-os-chef/sdc-sanity/chef-repo/cookbooks')
2 files changed, 17 insertions, 8 deletions
diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb index 517db3d76f..0ffa48d6ed 100644 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb +++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb @@ -1,5 +1,11 @@ tests_base="/var/lib/tests" -ci_test_suite="pass.xml" +ci_test_suite="onap.xml" + +bash "echo status" do + code <<-EOH + echo "DOCKER STARTED" + EOH +end bash "run asdc ci sanity tests" do cwd "#{tests_base}" @@ -10,10 +16,4 @@ code <<-EOH echo "return code from startTest.sh = [$?]" echo "DOCKER STARTED" EOH -timeout 72000 end -bash "echo status" do - code <<-EOH - echo "DOCKER STARTED" - EOH -end
\ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/sdc-sanity.yaml.erb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/sdc-sanity.yaml.erb index c57269c764..8dde3cdefe 100644 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/sdc-sanity.yaml.erb +++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/sdc-sanity.yaml.erb @@ -18,7 +18,7 @@ errorConfigurationFile: <%= @errorConfigurationFile %> configurationFile: <%= @ConfigurationFile %> importTypesConfigDir: <%= @importTypesDir %> titanPropertiesFile: <%= @titan_file %> -systemUnderDebug: false +systemUnderDebug: true cassandraHost: <%= @CASSANDRA_IP %> cassandraAuthenticate: true @@ -30,6 +30,15 @@ cassandraTruststorePassword : Aa123456 cassandraAuditKeySpace: sdcAudit cassandraArtifactKeySpace: sdcArtifact +# catalog backend protocol +<% if node[:disableHttp] -%> +sdcHttpMethod: https +<% else %> +sdcHttpMethod: http +<% end -%> + +localDataCenter: DC-Automate01 + stopOnClassFailure: false #List of non-abstract resources to keep during titan cleanup between tests |