Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update setup documentation for Linux and fix broken remoteFS setting

  • Loading branch information...
commit a13a82b9d75c69e0f24a0059fd757e186e87ea92 1 parent 48df78d
@whimboo whimboo authored
Showing with 20 additions and 3 deletions.
  1. +18 −2 README.md
  2. +2 −1  jenkins-master/config.xml
View
20 README.md
@@ -17,7 +17,7 @@ The two components (Pulse consumer and Jenkins master) have to be started separa
./start.sh
-Once Jenkins has been fully started, open `http://localhost:8080/` via your web browser. Open the `+admin` view and execute all of the listed jobs once.
+Once Jenkins has been fully started, open `http://localhost:8080/` via your web browser. Open the `+admin` view and execute all of the listed jobs once. Also update the `Jenkins URL` of the master to a public accessible IP or DNS name, so that slave nodes can successfully connect.
Now you can start the Pulse consumer which pushes requests for jobs through the Jenkins API to the master:
@@ -28,8 +28,24 @@ Please keep in mind that you should create your own configuration file before yo
Adding new Nodes
----------------
-To add Jenkins slaves to your master you have to create new nodes. You can use the `windows_xp_32_01` node settings as a template. Once done the nodes have to be connected to the master. Therefore [install Java](www.java.com/download/) on the node and open the appropriate node page from the nodes web browser like:
+To add Jenkins slaves to your master you have to create new nodes. You can use one of the example nodes (Windows XP and Ubuntu) as a template. Once done the nodes have to be connected to the master. Therefore Java has to be installed on the node first.
+
+Windows:
+
+Go to [www.java.com/download/](http://www.java.com/download/) and install the latest Java JRE
+
+Linux (Ubuntu):
+
+ sudo add-apt-repository ppa:ferramroberto/java
+ sudo apt-get update
+ sudo apt-get install sun-java6-jre sun-java6-plugin
+
+After Java has been installed open the appropriate node within Jenkins from the nodes web browser like:
http://IP:8080/computer/windows_xp_32_01/
Now click the `Launch` button and the node should automatically connect to the master. It will be used once a job for this type of platform has been requested by the Pulse consumer.
+
+Using the Jenkins master as executor
+------------------------------------
+If you want that the master node also executes jobs you will have to update its set of label and add the appropriate platform label, e.g. 'mac' for MacOS X.
View
3  jenkins-master/config.xml
@@ -6,6 +6,7 @@
<useSecurity>true</useSecurity>
<authorizationStrategy class="hudson.security.AuthorizationStrategy$Unsecured"/>
<securityRealm class="hudson.security.SecurityRealm$None"/>
+ <projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
<workspaceDir>${ITEM_ROOTDIR}/workspace</workspaceDir>
<buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
<jdks/>
@@ -16,7 +17,7 @@
<slave>
<name>ubuntu_32_01</name>
<description>Ubuntu 32bit (TEST_HOST)</description>
- <remoteFS>/var/jenkins</remoteFS>
+ <remoteFS>~/jenkins</remoteFS>
<numExecutors>1</numExecutors>
<mode>NORMAL</mode>
<retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
Please sign in to comment.
Something went wrong with that request. Please try again.