Author: oching
Date: Wed Mar 24 04:39:35 2010
New Revision: 926929
URL: http://svn.apache.org/viewvc?rev=926929&view=rev
Log:
[CONTINUUM-2391] Master should not pass full path to local repository to the agent
o add documentation for the changes in behavior made to distributed builds
Modified:
continuum/trunk/continuum-docs/src/site/apt/administrator_guides/distributed-builds.apt
continuum/trunk/continuum-docs/src/site/apt/administrator_guides/localRepository.apt
continuum/trunk/continuum-docs/src/site/apt/installation/build-agent.apt
Modified: continuum/trunk/continuum-docs/src/site/apt/administrator_guides/distributed-builds.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/administrator_guides/distributed-builds.apt?rev=926929&r1=926928&r2=926929&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/administrator_guides/distributed-builds.apt
(original)
+++ continuum/trunk/continuum-docs/src/site/apt/administrator_guides/distributed-builds.apt
Wed Mar 24 04:39:35 2010
@@ -57,7 +57,11 @@ Understanding Distributed Builds
[[4]] If there is a Build Agent available, the Master collects the information
necessary for the build (SCM URL, project id, etc.) and passes it when
invoking <<<buildProjects()>>> to the Build Agent with the smallest
number of
- tasks in its queue.
+ tasks in its queue. The Master also passes the <<<name>>> of the local
repository
+ of the project's project group. Make sure that a local repository with the same <<<name>>>
+ is configured in the Build Agent's configuration file since that is what will be
+ used when the project is built in the build agent. Otherwise, it will use the
+ local repository set in the build agent's <<<settings.xml>>> file.
[[5]] In the Build Agent, the build request is processed: the build is queued and
executed. Upon execution, the Build Agent first performs an SCM checkout or an SCM
Modified: continuum/trunk/continuum-docs/src/site/apt/administrator_guides/localRepository.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/administrator_guides/localRepository.apt?rev=926929&r1=926928&r2=926929&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/administrator_guides/localRepository.apt (original)
+++ continuum/trunk/continuum-docs/src/site/apt/administrator_guides/localRepository.apt Wed
Mar 24 04:39:35 2010
@@ -41,6 +41,9 @@ Local Repository
[../images/localrepository-add.png]
Adding a local repository will automatically create a default {{{./purgeConfiguration.html}
Purge Configuration}} for that repository.
+
+ If you're using distributed builds, you must configure a <<<localRepository>>>
with the same <<<name>>> in the build agent's configuration file where the
+ <<<location>>> is the local path to the local repository in the build
agent machine. See {{{./distributed-builds.html}Distributed Builds}} for more details.
* Default
Modified: continuum/trunk/continuum-docs/src/site/apt/installation/build-agent.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/installation/build-agent.apt?rev=926929&r1=926928&r2=926929&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/apt/installation/build-agent.apt (original)
+++ continuum/trunk/continuum-docs/src/site/apt/installation/build-agent.apt Wed Mar 24 04:39:35
2010
@@ -42,6 +42,13 @@ Installing and Configuring a Build Agent
<varValue>/Applications/apache-maven-2.0.9</varValue>
</installation>
</installations>
+ <localRepositories>
+ <localRepository>
+ <name>default</name>
+ <location>/home/user/.m2/repository</location>
+ <layout>default</layout>
+ </localRepository>
+ </localRepositories>
</continuum-buildagent-configuration>
+----------------+
@@ -54,7 +61,11 @@ Installing and Configuring a Build Agent
* <<<continuumServerUrl>>> - the URL pointing to the XML-RPC context
of the Continuum Master
* <<<installations>>> - a list of the installations available on the
Build Agent, including Maven, Ant, JDK, etc.
-
+
+ * <<<localRepositories>>> - a list of the local repositories that will
be used by the build agent when building and releasing projects.
+ The local repository <<<name>>> must match that of the local repository
configured in the Continuum Master. This configuration is
+ only available in Continuum 1.4.0+ to fix {{{http://jira.codehaus.org/browse/CONTINUUM-2391}CONTINUUM-2391}}.
+
Note that all of your agents need not be identical, as there is a way to control which
agent Continuum chooses by using a
{{{../administrator_guides/build-agent-groups.html}Build Agent Group}}. In addition, you
need to {{{../administrator_guides/buildEnvironment.html} configure}}
the Build Environment from the Master in order to specify which installation to use for
the build.
|