aboutsummaryrefslogtreecommitdiffstats
path: root/sdc-os-chef/sdc-sanity
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-11-01 13:42:05 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-01 13:42:05 +0000
commit9c92ea71a785f0c85dd87fcaf2a291809cac5a51 (patch)
tree6d4ffc66a259693508187a3ee8ed1693f4d09a4f /sdc-os-chef/sdc-sanity
parenta20a3a0aae67908aab5bf1c89ac48310cd3c1073 (diff)
parent1a9a0410df3f7aa5e0f23840d0beb3e0bbd0196e (diff)
Merge "sanity stabilization"
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.rb2
-rw-r--r--sdc-os-chef/sdc-sanity/startup.sh2
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