[ogsa-dai svn] SF.net SVN: ogsa-dai:[2107] test-framework/trunk/jenkins/ jersey-server-tests

[<amy...@us...>]

Revision: 2107
          http://ogsa-dai.svn.sourceforge.net/ogsa-dai/?rev=2107&view=rev
Author:   amykrause
Date:     2012-08-15 13:18:21 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
corrected config

Modified Paths:
--------------
    test-framework/trunk/jenkins/jersey-server-tests/README.txt
    test-framework/trunk/jenkins/jersey-server-tests/config.xml

Modified: test-framework/trunk/jenkins/jersey-server-tests/README.txt
===================================================================
--- test-framework/trunk/jenkins/jersey-server-tests/README.txt	2012-08-15 13:14:24 UTC (rev 2106)
+++ test-framework/trunk/jenkins/jersey-server-tests/README.txt	2012-08-15 13:18:21 UTC (rev 2107)
@@ -3,7 +3,9 @@
 
 1. Create a new job on Jenkins. (NOTE: The project name must not contain spaces)
 2. Copy config.xml to the the job directory.
-3. Replace '@SVN@' with the correct location of the OGSA-DAI dependencies and
-   packages directories.
-4. Point browser to the Jenkins webapp.
+3. Point browser to the Jenkins webapp and reload configuration from disk.
+4. Configure the job:
+   In 'Build' modify each build step 'Invoke Ant' by clicking on 'Advanced...'
+   Replace '$WORKSPACE' with the correct location of the OGSA-DAI dependencies 
+   and packages directories.
 5. Run 'Build Now' or adjust the Build Triggers.
\ No newline at end of file

Modified: test-framework/trunk/jenkins/jersey-server-tests/config.xml
===================================================================
--- test-framework/trunk/jenkins/jersey-server-tests/config.xml	2012-08-15 13:14:24 UTC (rev 2106)
+++ test-framework/trunk/jenkins/jersey-server-tests/config.xml	2012-08-15 13:18:21 UTC (rev 2107)
@@ -20,6 +20,10 @@
         <remote>https://ogsa-dai.svn.sourceforge.net/svnroot/ogsa-dai/test-framework/trunk/jenkins</remote>
         <local>ogsa-dai/test-framework/trunk/jenkins</local>
       </hudson.scm.SubversionSCM_-ModuleLocation>
+      <hudson.scm.SubversionSCM_-ModuleLocation>
+        <remote>https://ogsa-dai.svn.sourceforge.net/svnroot/ogsa-dai/third-party/dependencies</remote>
+        <local>third-party/dependencies</local>
+      </hudson.scm.SubversionSCM_-ModuleLocation>
     </locations>
     <excludedRegions></excludedRegions>
     <includedRegions></includedRegions>
@@ -42,26 +46,24 @@
     <hudson.tasks.Ant>
       <targets></targets>
       <buildFile>ogsa-dai/trunk/release-scripts/ogsa-dai/jersey/build.xml</buildFile>
-      <properties>env.OGSA_DAI_DEPENDENCIES=@SVN@/ogsa-dai/third-party/dependencies
-env.OGSA_DAI_PACKAGES=@SVN@/ogsa-dai/third-party/packages</properties>
+      <properties>env.OGSA_DAI_DEPENDENCIES=$WORKSPACE/third-party/dependencies
+env.OGSA_DAI_PACKAGES=$WORKSPACE/third-party/packages</properties>
     </hudson.tasks.Ant>
     <hudson.tasks.Ant>
       <targets>installAll</targets>
       <buildFile>ogsa-dai/test-framework/trunk/jenkins/jersey-server-tests/build.xml</buildFile>
-      <properties>env.OGSA_DAI_DEPENDENCIES=@SVN@/ogsa-dai/third-party/dependencies
-env.OGSA_DAI_PACKAGES=@SVN@/ogsa-dai/third-party/packages</properties>
+      <properties>env.OGSA_DAI_DEPENDENCIES=$WORKSPACE/third-party/dependencies
+env.OGSA_DAI_PACKAGES=$WORKSPACE/third-party/packages</properties>
     </hudson.tasks.Ant>
     <hudson.tasks.Ant>
       <targets>runTests</targets>
       <buildFile>ogsa-dai/test-framework/trunk/jenkins/jersey-server-tests/build.xml</buildFile>
-      <properties>env.OGSA_DAI_DEPENDENCIES=@SVN@/ogsa-dai/third-party/dependencies
-env.OGSA_DAI_PACKAGES=@SVN@/ogsa-dai/third-party/packages</properties>
+      <properties>env.OGSA_DAI_DEPENDENCIES=$WORKSPACE/third-party/dependencies
+env.OGSA_DAI_PACKAGES=$WORKSPACE/third-party/packages</properties>
     </hudson.tasks.Ant>
     <hudson.tasks.Ant>
       <targets>stopAll</targets>
       <buildFile>ogsa-dai/test-framework/trunk/jenkins/jersey-server-tests/build.xml</buildFile>
-      <properties>env.OGSA_DAI_DEPENDENCIES=@SVN@/ogsa-dai/third-party/dependencies
-env.OGSA_DAI_PACKAGES=@SVN@/ogsa-dai/third-party/packages</properties>
     </hudson.tasks.Ant>
   </builders>
   <publishers>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.