diff options
| author |   Michael Lando <ml636r@att.com> | 2017-10-26 17:32:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-26 17:32:58 +0000 |
| commit | 3bfa599ce2ca409622d3f4d0900a3543a812aabd (patch) | |
| tree | eddb9d41948f6171dc06c39f411fb604ec7e6f4a /sdc-os-chef/sdc-sanity | |
| parent | 4f74ac66e4e115654ec30c1f5553e079c3bd4e58 (diff) | |
| parent | 5d9812bdbdc1a10e7e05d227178d878798da2fab (diff) | |
Merge "sanity stabilization" into release-1.1.0
Diffstat (limited to 'sdc-os-chef/sdc-sanity')
| -rw-r--r-- | sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb | 2 | ||||
| -rw-r--r-- | sdc-os-chef/sdc-sanity/startup.sh | 2 |
2 files changed, 2 insertions, 2 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 690559a74d..c4323c233f 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 @@ -6,7 +6,7 @@ cwd "#{tests_base}" code <<-EOH cd "#{tests_base}" jar_file=`ls test-apis*-jar-with-dependencies.jar` - nohup ./startTest.sh $jar_file #{ci_test_suite} & + ./startTest.sh $jar_file #{ci_test_suite} > #{tests_base}/target/startTest.out 2>&1 echo "return code from startTest.sh = [$?]" EOH timeout 72000 diff --git a/sdc-os-chef/sdc-sanity/startup.sh b/sdc-os-chef/sdc-sanity/startup.sh index d4316c383f..e4edfc67e6 100644 --- a/sdc-os-chef/sdc-sanity/startup.sh +++ b/sdc-os-chef/sdc-sanity/startup.sh @@ -14,7 +14,7 @@ rc=$? # exit 0 #fi -while true; do sleep 2; done +#while true; do sleep 2; done ##/docker-entrypoint.sh |