diff --git a/integration-tests/build/build.xml b/integration-tests/build/build.xml index 458f607108ef6bdb01d51b61db3e199a4fbbc368..54edb53700e681b188b628278a6c80dc712cd7b1 100644 --- a/integration-tests/build/build.xml +++ b/integration-tests/build/build.xml @@ -90,6 +90,20 @@ </antcall> </target> + <target name="screening-integration-tests" + description="Runs integration tests for screening openBIS, fetches distribution from Cruise Control."> + <exec executable="sh" dir="${basedir}" resultproperty="result-code"> + <arg value="./test-screening.sh" /> + </exec> + <fail> + <condition> + <not> + <equals arg1="${result-code}" arg2="0" /> + </not> + </condition> + </fail> + </target> + <!-- // Cleans 'install' and 'playground' directories. --> diff --git a/integration-tests/templates/openBIS-server-screening/integration-tests-service.properties b/integration-tests/templates/openBIS-server-screening/integration-tests-service.properties index 5e50b60ebbfc04e17eda4f5b1d8fa5a3556cf226..cf6c8bcc51b77ab106ccd505c254c3bacc4f4b6f 100644 --- a/integration-tests/templates/openBIS-server-screening/integration-tests-service.properties +++ b/integration-tests/templates/openBIS-server-screening/integration-tests-service.properties @@ -5,4 +5,4 @@ # --------------------------------------------------------------------------- imaging.database.kind = integration_tests -database.kind = integration_tests \ No newline at end of file +database.kind = screening_integration_tests \ No newline at end of file diff --git a/integration-tests/test-screening.sh b/integration-tests/test-screening.sh index a6ec61e5f90f0424890f3ee18ed2751926dc3878..825571f18dc023ca12528df7a6ab248d41c03643 100755 --- a/integration-tests/test-screening.sh +++ b/integration-tests/test-screening.sh @@ -93,6 +93,7 @@ function install_screening_api { function install_screening { fetch_distributions + rm -fr $WORK mkdir -p $WORK install_dss_screening install_and_run_openbis_server_screening "true"