[Yanel-commits] rev 42039 - in public/yanel/trunk: . src/build/targets/continuous-integration

[guillaume at wyona.com]

Author: guillaume
Date: 2009-03-19 13:43:45 +0100 (Thu, 19 Mar 2009)
New Revision: 42039

Modified:
   public/yanel/trunk/src/build/targets/continuous-integration/CI
   public/yanel/trunk/yanel.sh
Log:
Enhanced the script to run for continuous integration:
- now fail-fast thanks to `sh -ex`
- fully automatic cleanup, configuration and build:
  - still quite a few hacks regarding user input
  - ports still cannot be changed
- final cleanup

Also had to change `yanel configure` to accept parameters.

Reminder: This revision of the script is only manually tested for now.
Issue: 6888


Modified: public/yanel/trunk/src/build/targets/continuous-integration/CI
===================================================================
--- public/yanel/trunk/src/build/targets/continuous-integration/CI	2009-03-19 12:04:01 UTC (rev 42038)
+++ public/yanel/trunk/src/build/targets/continuous-integration/CI	2009-03-19 12:43:45 UTC (rev 42039)
@@ -1,17 +1,28 @@
-#!/bin/sh
+#!/bin/sh -ex
+#TODO: allow ports configuration
+
 YANEL_SOURCE_HOME=`dirname $0`/../../../..
 cd $YANEL_SOURCE_HOME
-#TODO: clean and reconfigure the build automatically
-#rm -f src/build/local.build.properties
-#rm -Rf conf/local
-#./build.sh clean-all
-#./configure.sh ...
-./build.sh clean
+
+rm -f src/build/local.build.properties
+./build.sh clean-all
+#TODO: use our own Maven local repo instead of the user's!
+
+./yanel.sh configure -Danswer=NO \
+ -DanswerReconfigureTomcat1=YES \
+ -DpathOfUserSpecificTomcat=/opt/hudson/home/jobs/Yanel-trunk/workspace/yanel-trunk.working-copy/local/apache-tomcat-5.5.20 #XXX HACK
+
 #TODO: delete then recreate a few resources from scratch:
 #./build.sh new-resource-type ...
-./build.sh #FIXME: endorsed lib management asks for user input
+
+./build.sh -Danswer=YES #XXX HACK: endorsed lib management always uses the same variable to ask for user input
+
 ./yanel.sh start
+
 ./build.sh test
 #TODO: test the resources from scratch
 #TODO: run Canoo tests
+
 ./yanel.sh stop
+
+./build.sh clean -Dforce-clean=true

Modified: public/yanel/trunk/yanel.sh
===================================================================
--- public/yanel/trunk/yanel.sh	2009-03-19 12:04:01 UTC (rev 42038)
+++ public/yanel/trunk/yanel.sh	2009-03-19 12:43:45 UTC (rev 42039)
@@ -54,7 +54,8 @@
   fi  
 elif [ "$1" = "configure" ]; then
   echo "INFO: Configuring Yanel..."
-  $OUR_ANT config
+  shift
+  $OUR_ANT config "$@"
 elif [ "$1" = "build" ]; then
   echo "INFO: Building Yanel..."
   shift