[jboss-cvs] JBossAS SVN: r94336 - in projects/jboss-osgi/projects/osgitck/r4v42: hudson and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 5 02:59:28 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-10-05 02:59:28 -0400 (Mon, 05 Oct 2009)
New Revision: 94336
Removed:
projects/jboss-osgi/projects/osgitck/r4v42/hudson/ant.properties.example
Modified:
projects/jboss-osgi/projects/osgitck/r4v42/
projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
projects/jboss-osgi/projects/osgitck/r4v42/build.xml
projects/jboss-osgi/projects/osgitck/r4v42/hudson/build.xml
projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
Log:
Setup hudson - wip
Property changes on: projects/jboss-osgi/projects/osgitck/r4v42
___________________________________________________________________
Name: svn:ignore
+ target
ant.properties
Modified: projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-10-05 06:41:21 UTC (rev 94335)
+++ projects/jboss-osgi/projects/osgitck/r4v42/ant.properties.example 2009-10-05 06:59:28 UTC (rev 94336)
@@ -6,8 +6,31 @@
# The location of the OSGi TCK
osgitck.zip=/home/tdiesler/svn/r4v42-core-cmpn-final.zip
-# The location of the aQute Bnd
-aQute.bnd.jar=/home/tdiesler/.m2/repository/biz/aQute/aQute.bnd/0.0.366-SNAPSHOT/aQute.bnd-0.0.366-SNAPSHOT.jar
+# The location od the local maven repository
+maven.local.repository=/home/tdiesler/.m2/repository
-# The location of the framework
-jboss.osgi.framework.jar=/home/tdiesler/.m2/repository/org/jboss/osgi/runtime/jboss-osgi-framework/1.0.0-SNAPSHOT/jboss-osgi-framework-1.0.0-SNAPSHOT-all.jar
+# The aQute Bnd version
+aQute.bnd.version=0.0.366-SNAPSHOT
+
+# The JBoss OSGi framework version
+jboss.osgi.framework.version=1.0.0-SNAPSHOT
+
+# Hudson Setup ----------------------------------------------------------------
+
+# JDK settings
+java.home.jdk15=/usr/java/jdk1.5.0_19
+java.home.jdk16=/usr/java/jdk1.6.0_14
+
+# Hudson QA Environment
+hudson.username=changeme
+hudson.password=changeme
+
+hudson.root=/home/tdiesler/workspace/hudson/osgitck
+
+hudson.host=localhost
+hudson.admin.port=8150
+hudson.http.port=8180
+
+# Hudson (1.290)
+apache-tomcat=5.5.27
+sun-hudson=2402/128862
Modified: projects/jboss-osgi/projects/osgitck/r4v42/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-10-05 06:41:21 UTC (rev 94335)
+++ projects/jboss-osgi/projects/osgitck/r4v42/build.xml 2009-10-05 06:59:28 UTC (rev 94336)
@@ -32,10 +32,12 @@
<fail message="Cannot find: ${osgitck.zip}" unless="osgitck.zip.available" />
<!-- Check if the aQute.bnd jar is available -->
+ <property name="aQute.bnd.jar" value="${maven.local.repository}/biz/aQute/aQute.bnd/${aQute.bnd.version}/aQute.bnd-${aQute.bnd.version}.jar" />
<available property="aQute.bnd.available" file="${aQute.bnd.jar}" />
<fail message="Cannot find: ${aQute.bnd.jar}" unless="aQute.bnd.available" />
<!-- Check if the jboss.osgi.framework jar is available -->
+ <property name="jboss.osgi.framework.jar" value="${maven.local.repository}/org/jboss/osgi/runtime/jboss-osgi-framework/${jboss.osgi.framework.version}/jboss-osgi-framework-${jboss.osgi.framework.version}-all.jar" />
<available property="jboss.osgi.framework.available" file="${jboss.osgi.framework.jar}" />
<fail message="Cannot find: ${jboss.osgi.framework.jar}" unless="jboss.osgi.framework.available" />
@@ -53,6 +55,7 @@
<!-- Unzip the OSGi TCK-->
<target name="unzip-osgitck" depends="init" unless="osgitck.dir.available">
<unzip src="${osgitck.zip}" dest="${target.dir}" />
+ <available property="osgitck.dir.available" file="${osgitck.dir}" />
</target>
<target name="setup" depends="init,unzip-osgitck">
@@ -74,6 +77,32 @@
</target>
<!-- ================================================================== -->
+ <!-- Hudson -->
+ <!-- ================================================================== -->
+
+ <target name="hudson-setup">
+ <ant dir="${basedir}/hudson" target="hudson-setup" />
+ </target>
+
+ <target name="hudson-start">
+ <ant dir="${basedir}/hudson" target="hudson-start" />
+ </target>
+
+ <target name="hudson-stop">
+ <ant dir="${basedir}/hudson" target="hudson-stop" />
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- TCK Tests -->
+ <!-- ================================================================== -->
+
+ <target name="tck-core-tests">
+ <ant dir="${osgitck.dir}/osgi.ct" target="clean" />
+ <ant dir="${osgitck.dir}/osgi.ct" target="publish" />
+ <ant dir="${osgitck.dir}/osgi.ct" target="osgi.core.tests" />
+ </target>
+
+ <!-- ================================================================== -->
<!-- Clean -->
<!-- ================================================================== -->
Deleted: projects/jboss-osgi/projects/osgitck/r4v42/hudson/ant.properties.example
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/ant.properties.example 2009-10-05 06:41:21 UTC (rev 94335)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/ant.properties.example 2009-10-05 06:59:28 UTC (rev 94336)
@@ -1,29 +0,0 @@
-#
-# A sample ant properties file
-#
-# $Id: $
-
-# JDK settings
-java.home.jdk15=/usr/java/jdk1.5.0_19
-java.home.jdk16=/usr/java/jdk1.6.0_14
-
-# Hudson QA Environment
-hudson.username=changeme
-hudson.password=changeme
-
-hudson.root=/home/hudson/workspace/hudson/org.osgi
-
-hudson.host=localhost
-hudson.admin.port=8250
-hudson.http.port=8280
-
-hudson.mail.recipients=
-hudson.smtp.host=localhost
-
-# Hudson (1.290)
-apache-tomcat=5.5.27
-sun-hudson=2402/128862
-
-# authentication cancelled error
-# https://hudson.dev.java.net/issues/show_bug.cgi?id=3936
-
Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/build.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/build.xml 2009-10-05 06:41:21 UTC (rev 94335)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/build.xml 2009-10-05 06:59:28 UTC (rev 94336)
@@ -20,6 +20,7 @@
<!-- ================================================================== -->
<!-- Hudson Jobs -->
<!-- ================================================================== -->
+
<macrodef name="copyjobs">
<sequential>
<copy todir="${hudson.home}/jobs" overwrite="true">
@@ -28,7 +29,7 @@
</fileset>
<filterset>
<filter token="hudson.osgi.url" value="${hudson.osgi.url}"/>
- <filtersfile file="${hudson.dir}/ant.properties"/>
+ <filtersfile file="${project.root.dir}/ant.properties"/>
</filterset>
</copy>
</sequential>
@@ -40,10 +41,10 @@
<target name="init">
<!-- Check if ant.properties is available -->
- <available property="ant.properties.available" file="${basedir}/ant.properties"/>
+ <available property="ant.properties.available" file="${project.root.dir}/ant.properties"/>
<fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
- <property file="${basedir}/ant.properties"/>
+ <property file="${project.root.dir}/ant.properties"/>
</target>
<target name="init-hudson" depends="init">
@@ -131,7 +132,7 @@
<include name="**/*.xml"/>
</fileset>
<filterset>
- <filtersfile file="${hudson.dir}/ant.properties"/>
+ <filtersfile file="${project.root.dir}/ant.properties"/>
<filter token="hudson.home" value="${hudson.home}"/>
</filterset>
</copy>
@@ -142,7 +143,7 @@
<include name="*.xml"/>
</fileset>
<filterset>
- <filtersfile file="${hudson.dir}/ant.properties"/>
+ <filtersfile file="${project.root.dir}/ant.properties"/>
</filterset>
</copy>
Modified: projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml
===================================================================
--- projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-10-05 06:41:21 UTC (rev 94335)
+++ projects/jboss-osgi/projects/osgitck/r4v42/hudson/hudson-home/jobs/osgi.core.tests/config.xml 2009-10-05 06:59:28 UTC (rev 94336)
@@ -8,7 +8,7 @@
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
<remote>@hudson.osgi.url@</remote>
- <local>org.osgi</local>
+ <local>osgitck</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
<useUpdate>true</useUpdate>
@@ -21,28 +21,23 @@
<builders>
<hudson.tasks.Shell>
<command>
-OSGIDIR=$WORKSPACE/org.osgi
-TCKDIR=$OSGIDIR/osgi.ct
+OSGITCKDIR=$WORKSPACE/osgitck
-# Build the TCK
-cd $TCKDIR
-ant clean publish
+# Setup the TCK
+cd $OSGITCKDIR
+cp ant.properties.example ant.properties
-# Run the core framework tests
-ant osgi.core.tests
+# Setup the TCK
+ant clean setup
-# Copy the test reports
-REPORTSDIR=$WORKSPACE/test-reports
-rm -rf $REPORTSDIR; mkdir $REPORTSDIR
-for file in `find $TCKDIR/generated -name TEST-*.xml`; do
- cp $file $REPORTSDIR
-done
+# Run the core tests
+ant tck-core-tests
</command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>test-reports/TEST-*.xml</testResults>
+ <testResults>osgitck/osgi.ct/generated/**/test-reports/TEST-*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
</publishers>
<buildWrappers/>
More information about the jboss-cvs-commits
mailing list