[jboss-cvs] JBossAS SVN: r85594 - in projects/jboss-osgi/trunk/build/hudson: hudson-home and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Mar 7 05:31:28 EST 2009 

Author: thomas.diesler at jboss.com
Date: 2009-03-07 05:31:27 -0500 (Sat, 07 Mar 2009)
New Revision: 85594

Added:
   projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-Matrix/
   projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Embedded-Matrix/
   projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JDK1.5/
   projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JDK1.6/
Removed:
   projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBossOSGi-Container-Matrix/
   projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBossOSGi-Embedded-Matrix/
   projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBossOSGi-JDK1.5/
   projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBossOSGi-JDK1.6/
Modified:
   projects/jboss-osgi/trunk/build/hudson/ant.properties.example
   projects/jboss-osgi/trunk/build/hudson/build.xml
   projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml
Log:
Support multiple versions in hudson-setup

Modified: projects/jboss-osgi/trunk/build/hudson/ant.properties.example
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/ant.properties.example	2009-03-07 09:29:50 UTC (rev 85593)
+++ projects/jboss-osgi/trunk/build/hudson/ant.properties.example	2009-03-07 10:31:27 UTC (rev 85594)
@@ -20,19 +20,19 @@
 
 hudson.maven.path=/usr/java/apache-maven-2.0.9
 
-hudson.root=/home/hudson/workspace
+hudson.root=/home/hudson/workspace/hudson/jboss-osgi
 
 hudson.maven.profile=$HUDSONDIR/profiles.xml.local.qa
 
 hudson.host=jbpm.dyndns.org
-hudson.admin.port=8150
-hudson.http.port=8180
+hudson.admin.port=8250
+hudson.http.port=8280
 
 #hudson.jboss501.zip=file:///home/hudson/download/java/jboss/jboss-5.0.1.GA.zip
 
 hudson.mail.recipients=
 hudson.smtp.host=localhost
 
-# Hudson (1.282)
+# Hudson (1.290)
 apache-tomcat=5.5.20
-sun-hudson=2402/126367
\ No newline at end of file
+sun-hudson=2402/128862

Modified: projects/jboss-osgi/trunk/build/hudson/build.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/build.xml	2009-03-07 09:29:50 UTC (rev 85593)
+++ projects/jboss-osgi/trunk/build/hudson/build.xml	2009-03-07 10:31:27 UTC (rev 85594)
@@ -16,6 +16,18 @@
   <property name="hudson.dir" value="${basedir}"/>
   <property name="hudson.target.dir" value="${hudson.dir}/target"/>
   <property name="project.root.dir" value="${basedir}/../.."/>
+
+  <!-- ================================================================== -->
+  <!-- Hudson Jobs                                                        -->
+  <!-- ================================================================== -->
+  <macrodef name="copyjobs">
+     <sequential>
+       <copyjob job="Container-Matrix"/>
+       <copyjob job="Embedded-Matrix"/>
+       <copyjob job="JDK1.5"/>
+       <copyjob job="JDK1.6"/>
+     </sequential>
+  </macrodef>
   
   <!-- ================================================================== -->
   <!-- Initialization                                                     -->
@@ -30,17 +42,15 @@
     
     <xmlproperty file="${project.root.dir}/pom.xml"/>
     <property name="version.id" value="${project.version}"/>
-    <property name="repository.id" value="${project.version}"/>
+    <property name="hudson.job.prefix" value="JBossOSGi-${project.version}"/>
     
-    <echo message="version.id=${version.id}"/>
-    <echo message="repository.id=${repository.id}"/>
+    <echo message="${hudson.job.prefix}"/>
   </target>
   
   <target name="init-hudson" depends="init">
-    <property name="hudson.base" value="${hudson.root}/jboss-osgi-hudson-${version.id}"/>
-    <property name="hudson.tomcat" value="${hudson.base}/apache-tomcat"/>
-    <property name="hudson.home" value="${hudson.base}/hudson-home"/>
-    <property name="hudson.jboss" value="${hudson.base}/jboss"/>
+    <property name="hudson.tomcat" value="${hudson.root}/apache-tomcat"/>
+    <property name="hudson.home" value="${hudson.root}/hudson-home"/>
+    <property name="hudson.jboss" value="${hudson.root}/jboss"/>
     
     <echo/>
     <echo message="hudson.root = ${hudson.root}"/>
@@ -49,7 +59,7 @@
     
     <available file="${hudson.root}" property="hudson.root.available"/>
     <available file="${hudson.tomcat}" property="hudson.tomcat.available"/>
-    <fail message="Hudson root not available" unless="hudson.root.available"/>
+    <fail message="Hudson root not available: ${hudson.root}" unless="hudson.root.available"/>
     
     <property name="hudson.username.${hudson.username}" value="true"/>
     <fail message="Cannot use default hudson username: ${hudson.username}" if="hudson.username.changeme"/>
@@ -69,7 +79,7 @@
     Get thirdparty dependencies 
   -->
   <target name="thirdparty" depends="init-thirdparty,get-tomcat,get-hudson,get-jboss501">
-    <copy todir="${hudson.base}/jboss" file="${thirdparty.dir}/jboss-5.0.1.GA.zip"/>
+    <copy todir="${hudson.root}/jboss" file="${thirdparty.dir}/jboss-5.0.1.GA.zip"/>
   </target>
   <target name="get-tomcat" depends="init-thirdparty" unless="apache.tomcat.available">
     <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/>
@@ -88,7 +98,6 @@
   <target name="hudson-tomcat-setup" depends="thirdparty" unless="hudson.tomcat.available">
     
     <!-- Install Tomcat -->
-    <mkdir dir="${hudson.root}"/>
     <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/>
     <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/>
     <chmod perm="+x">
@@ -135,22 +144,21 @@
       </filterset>
     </copy>
     
-    <!-- Configure Hudson -->
-    <copy todir="${hudson.home}" overwrite="true">
+    <!-- Configure Hudson Home -->
+    <copy todir="${hudson.home}" overwrite="false">
       <fileset dir="${hudson.dir}/hudson-home">
-        <include name="jobs/*/config.xml"/>
-        <include name="command.sh"/>
         <include name="*.xml"/>
       </fileset>
       <filterset>
-        <filter token="hudson.osgi.url" value="${hudson.osgi.url}"/>
-        <filter token="hudson.base" value="${hudson.base}"/>
-        <filter token="hudson.home" value="${hudson.home}"/>
         <filter token="version.id" value="${version.id}"/>
+        <filter token="hudson.job.prefix" value="${hudson.job.prefix}"/>
         <filtersfile file="${hudson.dir}/ant.properties"/>
       </filterset>
     </copy>
 
+    <!-- Configure Hudson Jobs -->
+    <copyjobs/>
+
     <echo/>
     <echo message="*************************************"/>
     <echo message="* Hudson setup successfully         *"/>
@@ -194,4 +202,20 @@
 
   </target>
   
+  <macrodef name="copyjob">
+     <attribute name="job"/>
+     <sequential>
+       <copy todir="${hudson.home}/jobs/${hudson.job.prefix}-@{job}" overwrite="true">
+         <fileset dir="${hudson.dir}/hudson-home/jobs/@{job}">
+           <include name="config.xml"/>
+         </fileset>
+         <filterset>
+           <filter token="hudson.osgi.url" value="${hudson.osgi.url}"/>
+           <filter token="version.id" value="${version.id}"/>
+           <filtersfile file="${hudson.dir}/ant.properties"/>
+         </filterset>
+       </copy>
+     </sequential>
+  </macrodef>
+  
 </project>

Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml	2009-03-07 09:29:50 UTC (rev 85593)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml	2009-03-07 10:31:27 UTC (rev 85594)
@@ -4,10 +4,9 @@
   <useSecurity>true</useSecurity>
   <systemMessage>
     <![CDATA[
-  <h2>JBoss OSGi @version.id@ QA Environment</h2>
+  <h2>JBossOSGi QA Environment</h2>
   
   <table>
-  <tr align="left"><th>SVN</th><td>@hudson.osgi.url@</td></tr>
   <tr align="left"><th>Bind Addr</th><td>@jboss.bind.address@</td></tr>
   </table>
 ]]>
@@ -22,6 +21,27 @@
       <javaHome>@java.home.jdk16@</javaHome>
     </jdk>
   </jdks>
+  <clouds/>
   <slaves/>
   <quietPeriod>5</quietPeriod>
+  <views>
+    <hudson.model.AllView>
+      <owner class="hudson" reference="../../.."/>
+      <name>All</name>
+    </hudson.model.AllView>
+    <listView>
+      <owner class="hudson" reference="../../.."/>
+      <name>V at version.id@</name>
+      <jobNames class="tree-set">
+        <comparator class="hudson.util.CaseInsensitiveComparator"/>
+      </jobNames>
+      <includeRegex>@hudson.job.prefix at -(.*)</includeRegex>
+    </listView>
+  </views>
+  <primaryView>All</primaryView>
+  <slaveAgentPort>0</slaveAgentPort>
+  <label></label>
+  <nodeProperties/>
+  <globalNodeProperties/>
+  <disabledAdministrativeMonitors/>
 </hudson>
\ No newline at end of file

Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-Matrix (from rev 85592, projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBossOSGi-Container-Matrix)

Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Embedded-Matrix (from rev 85592, projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBossOSGi-Embedded-Matrix)


Property changes on: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Embedded-Matrix
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JDK1.5 (from rev 85592, projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBossOSGi-JDK1.5)

Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JDK1.6 (from rev 85592, projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBossOSGi-JDK1.6)

More information about the jboss-cvs-commits mailing list