minor: do not build openbis from sources in integration tests, use zips from CI

SVN: 18133

integration-tests/build/build.xml

@@ -65,7 +65,7 @@
 	</target>
 
 	<target name="integration-tests"
-	        description="Runs integration tests, rebuild everything from svn sources.">
+	        description="Runs integration tests, fetch distributions from continous integration system.">
 		<antcall target="internal-launch">
 			<param name="arg1" value="--all" />
 			<param name="arg2" value="" />
@@ -91,7 +91,7 @@
 	</target>
 
   <target name="screening-integration-tests"
-          description="Runs integration tests for screening openBIS, fetches distribution from Cruise Control.">
+          description="Runs integration tests for screening openBIS, fetches distribution from continous integration system.">
     <exec executable="sh" dir="${basedir}" resultproperty="result-code">
 			<arg value="./test-screening.sh" />
 		</exec>

integration-tests/common.bash

@@ -250,7 +250,7 @@ function build_zips {
                 if [ "$use_local_source" = "true" ]; then
                     build_zips_from_local $build_dss $build_dmv $build_openbis
             else
-                    build_zips_from_svn $build_dss $build_dmv $build_openbis
+                    fetch_zips_from_hudson $build_dss $build_dmv $build_openbis
                 fi
     else
                 echo "No components to build were specified (--help explains how to do this)."
@@ -309,17 +309,20 @@ function build_remote {
     cd ..
 }
 
-function build_zips_from_svn {
+function fetch_distributions {
+	local project=$1
+	
+	mkdir -p $INSTALL
+	fetch_latest_artifacts_from_cruise_control $project $INSTALL
+}
+
+function fetch_zips_from_hudson {
     build_dss=$1
     build_dmv=$2
     build_openbis=$3
 
-    RSC=build_resources
-    rm -fr $RSC
-    run_svn checkout svn+ssh://svncisd.ethz.ch/repos/cisd/build_resources/trunk $RSC
-    build_components "build_remote $RSC" $build_dss $build_dmv $build_openbis
-    mv $RSC/*.zip $INSTALL
-    rm -fr $RSC 
+		rm -fr $INSTALL
+    build_components "fetch_distributions" $build_dss $build_dmv $build_openbis
 }
 
 function fetch_latest_artifacts_from_cruise_control {

integration-tests/test-screening.sh

@@ -45,13 +45,6 @@ function prepare_data_second_phase {
     chmod -R 700 $DSS_INCOMING_PARENT_DIR/incoming*
 }
 
-
-function fetch_distributions {
-	rm -fr $INSTALL
-	mkdir -p $INSTALL
-	fetch_latest_artifacts_from_cruise_control screening $INSTALL
-}
-
 function install_and_run_openbis_server_screening {
     local install_openbis=$1
     
@@ -97,7 +90,8 @@ function install_screening_api {
 }
 
 function install_screening {
-		fetch_distributions
+		rm -fr $INSTALL
+		fetch_distributions screening
 
 		echo Dropping imaging database: $IMAGING_DB
 		psql_cmd=`run_psql`
@@ -161,7 +155,7 @@ function integration_tests_screening {
     assertSpotSizes "24x16,24x16,24x16" 
     assertFeatureVectorDef HITRATE "Hit Rate"
     assertFeatureVectorDef CELLNUMBER cellNumber
-    # TODO: add a check if the results are correct
+
     test_screening_api
     
     switch_dss "off" datastore_server_screening