diff --git a/drydocker/generic_integration.sh b/drydocker/generic_integration.sh index 3c6a4be..f128dba 100644 --- a/drydocker/generic_integration.sh +++ b/drydocker/generic_integration.sh @@ -1,36 +1,37 @@ #!/bin/bash -function generic_integration { +function generic_integration_setup { retval=0 max_tries=10 try_retval=1 while [ ${try_retval} -ne 0 -a ${max_tries} -gt 0 ]; do try_retval=$(_shell yum -y install kolab) if [ ${try_retval} -eq 0 ]; then max_tries=0 retval=0 else + echo "WARNING: Could not install kolab, sleeping for 10 seconds." let max_tries-- retval=${try_retval} fi sleep 10 done if [ ${retval} -ne 0 ]; then return ${retval} fi retval=$(setup-kolab \ --default \ --mysqlserver=new \ --timezone=Europe/Zurich \ --directory-manager-pwd=Welcome2KolabSystems ) return ${retval} } diff --git a/drydocker/pykolab/test_integration.sh b/drydocker/pykolab/test_integration.sh new file mode 100644 index 0000000..52f8050 --- /dev/null +++ b/drydocker/pykolab/test_integration.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +pushd /srv/${PACKAGE}.git + +source /srv/stick.git/drydocker/generic_integration.sh + +retval=$(_shell generic_integration_setup) + +if [ ${retval} -ne 0 ]; then + exit ${retval} +fi + +pushd /srv/stick.git/integration/ +retval=$(_shell NOSE_VERBOSE=2 nosetests P/all.py) + +if [ ${retval} -ne 0 ]; then + exit ${retval} +fi + +popd +popd diff --git a/drydocker/pykolab/test_obs.sh b/drydocker/pykolab/test_obs.sh index bb00a8d..c971f23 100755 --- a/drydocker/pykolab/test_obs.sh +++ b/drydocker/pykolab/test_obs.sh @@ -1,12 +1,19 @@ #!/bin/bash pushd /srv/${PACKAGE}.git source /srv/stick.git/drydocker/generic_obs.sh retval=$(_shell obs_build_local) if [ ${retval} -ne 0 ]; then exit ${retval} fi + +retval=$(_shell obs_build_install) + +if [ ${retval} -ne 0 ]; then + exit ${retval} +fi + popd