From ceee1e88612164dde87c5b8a97351dd52cbef857 Mon Sep 17 00:00:00 2001 From: Yuli Shlosberg Date: Tue, 10 Oct 2017 13:42:23 +0300 Subject: Fix for sdc csit sanity test fix sdc csit sanity flow by adding memory to sanity docker Change-Id: Id40a87ee4d59af4f79a97d61ee4877887ab97d30 Issue-Id: SDC-445 Signed-off-by: Yuli Shlosberg --- test/csit/scripts/sdc/clone_and_setup_sdc_data.sh | 4 ++++ test/csit/scripts/sdc/start_sdc_containers.sh | 2 +- test/csit/scripts/sdc/start_sdc_sanity.sh | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh b/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh index 97f767381..a88981299 100644 --- a/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh +++ b/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh @@ -27,6 +27,10 @@ echo "This is ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh" # Clone sdc enviroment template mkdir -p ${WORKSPACE}/data/environments/ mkdir -p ${WORKSPACE}/data/clone/ +mkdir -p ${WORKSPACE}/data/logs/BE/SDC/SDC-BE +mkdir -p ${WORKSPACE}/data/logs/FE/SDC/SDC-FE +chmod -R 777 ${WORKSPACE}/data/logs + cd ${WORKSPACE}/data/clone git clone --depth 1 http://gerrit.onap.org/r/sdc -b master diff --git a/test/csit/scripts/sdc/start_sdc_containers.sh b/test/csit/scripts/sdc/start_sdc_containers.sh index bccea70bb..a1ac28b14 100644 --- a/test/csit/scripts/sdc/start_sdc_containers.sh +++ b/test/csit/scripts/sdc/start_sdc_containers.sh @@ -105,5 +105,5 @@ done if [ "$TIME" -ge "$TIME_OUT" ]; then echo TIME OUT: Docker containers not started in $TIME_OUT seconds... Could cause problems for tests... - +fi diff --git a/test/csit/scripts/sdc/start_sdc_sanity.sh b/test/csit/scripts/sdc/start_sdc_sanity.sh index 7f2de0ef9..e9e92148b 100644 --- a/test/csit/scripts/sdc/start_sdc_sanity.sh +++ b/test/csit/scripts/sdc/start_sdc_sanity.sh @@ -26,7 +26,7 @@ #start Sanity docker -docker run --detach --name sdc-sanity --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env http_proxy=${http_proxy} --env https_proxy=${https_proxy} --env no_proxy=${no_proxy} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 512m --memory-swap=512m --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume ${WORKSPACE}/data/logs/sdc-sanity/target:/var/lib/tests/target --volume ${WORKSPACE}/data/logs/sdc-sanity/ExtentReport:/var/lib/tests/ExtentReport --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 9560:9560 ${PREFIX}/sdc-sanity:${RELEASE} +docker run --detach --name sdc-sanity --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env http_proxy=${http_proxy} --env https_proxy=${https_proxy} --env no_proxy=${no_proxy} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 1g --memory-swap=1g --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume ${WORKSPACE}/data/logs/sdc-sanity/target:/var/lib/tests/target --volume ${WORKSPACE}/data/logs/sdc-sanity/ExtentReport:/var/lib/tests/ExtentReport --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 9560:9560 ${PREFIX}/sdc-sanity:${RELEASE} #echo "please wait while Sanity Docker is starting..." echo "" @@ -66,3 +66,5 @@ if [ "$TIME" -ge "$TIME_OUT" ] echo TIME OUT: Sany was NOT completed in $TIME_OUT seconds... Could cause problems for tests... fi cp -rf ${WORKSPACE}/data/logs/sdc-sanity/ExtentReport/* ${WORKSPACE}/archives/ +cp -rf ${WORKSPACE}/data/logs/ ${WORKSPACE}/archives/ + -- cgit 1.2.3-korg