From 1a9a0410df3f7aa5e0f23840d0beb3e0bbd0196e Mon Sep 17 00:00:00 2001 From: Yuli Shlosberg Date: Thu, 26 Oct 2017 15:32:58 +0300 Subject: sanity stabilization Change-Id: Idb6bae5b58b9430480756cb2ecf850e878bca114 Issue-Id: SDC-542 Signed-off-by: Yuli Shlosberg --- .../cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb | 2 +- sdc-os-chef/sdc-sanity/startup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sdc-os-chef/sdc-sanity') 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 -- cgit 1.2.3-korg