From 7602a54309adbe5c5346ee6befecc2e596976504 Mon Sep 17 00:00:00 2001 From: mbeierl Date: Tue, 11 Jul 2017 15:12:35 -0400 Subject: Change all paths Changes the paths of all source code so that it exists under the dockerfile location for each container. This way we can use COPY instead of git clone, as well as use the existing JJB. Change-Id: I883b2957d89659c164fff0a1ebc4d677c534796d JIRA: STORPERF-188 Signed-off-by: mbeierl --- ci/verify.sh | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) (limited to 'ci/verify.sh') diff --git a/ci/verify.sh b/ci/verify.sh index feb84d2..cd5bbbb 100755 --- a/ci/verify.sh +++ b/ci/verify.sh @@ -45,19 +45,35 @@ pip install requests==2.13.0 pip install scp==0.10.2 pip install six==1.10.0 -python ci/setup.py develop - -flake8 storperf +final_rc=0 +flake8 docker/storperf-* flake8rc=$? -nosetests --with-xunit \ - --with-coverage \ - --cover-package=storperf\ - --cover-xml \ - --cover-html \ - tests -rc=$? +for testdir in docker/storperf-* +do + if [ -d $testdir/tests ] + then + cwd=$(pwd) + cd $testdir + + nosetests --with-xunit \ + --with-coverage \ + --cover-package=storperf\ + --cover-xml \ + --cover-html \ + tests + rc=$? + if [ $rc -ne 0 ] + then + final_rc=$rc + fi + cd $cwd + fi +done + +cp ./docker/storperf-master/coverage.xml . +cp ./docker/storperf-master/nosetests.xml . deactivate @@ -67,4 +83,4 @@ then exit $flake8rc fi -exit $rc +exit $final_rc -- cgit 1.2.3-korg