Permalink
Browse files

Add sepearate feature build jobs. Add thread-expr.

  • Loading branch information...
hugoduncan committed Apr 20, 2011
1 parent 2801188 commit 18bc944fe3cc34f7fabb1744ad2b33543449784a
Showing with 230 additions and 167 deletions.
  1. +18 −13 pom.xml
  2. +16 −12 src/pallet/ci.clj
  3. +196 −142 src/pallet/node/ci.clj
View
31 pom.xml
@@ -34,6 +34,7 @@
<groupId>com.theoryinpractise</groupId>
<artifactId>clojure-maven-plugin</artifactId>
<configuration>
+ <script>src/pallet/ci.clj</script>
</configuration>
<executions>
<execution>
@@ -56,7 +57,7 @@
<skip>true</skip>
</configuration>
</execution>
- </executions>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -72,7 +73,6 @@
</executions>
<configuration>
<executable>java</executable>
- <workingDirectory>/tmp</workingDirectory>
<!-- <mainClass>clojure.main</mainClass> -->
<classpathScope>compile</classpathScope>
<arguments>
@@ -111,52 +111,57 @@
<dependency>
<groupId>org.cloudhoist</groupId>
<artifactId>hudson</artifactId>
- <version>0.4.0</version>
+ <version>0.4.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cloudhoist</groupId>
<artifactId>java</artifactId>
- <version>0.4.0</version>
+ <version>0.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cloudhoist</groupId>
+ <artifactId>maven</artifactId>
+ <version>0.4.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cloudhoist</groupId>
<artifactId>tomcat</artifactId>
- <version>0.4.0</version>
+ <version>0.4.2</version>
</dependency>
<dependency>
<groupId>org.cloudhoist</groupId>
<artifactId>automated-admin-user</artifactId>
- <version>0.4.0</version>
+ <version>0.4.2</version>
</dependency>
<dependency>
<groupId>org.cloudhoist</groupId>
<artifactId>git</artifactId>
- <version>0.4.0</version>
+ <version>0.4.1</version>
</dependency>
<dependency>
<groupId>org.cloudhoist</groupId>
<artifactId>gpg</artifactId>
- <version>0.4.0</version>
+ <version>0.4.1</version>
</dependency>
<dependency>
<groupId>org.cloudhoist</groupId>
<artifactId>iptables</artifactId>
- <version>0.4.0</version>
+ <version>0.4.1</version>
</dependency>
<dependency>
<groupId>org.cloudhoist</groupId>
<artifactId>ssh</artifactId>
- <version>0.4.0</version>
+ <version>0.4.1</version>
</dependency>
<dependency>
<groupId>org.cloudhoist</groupId>
<artifactId>ssh-key</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>0.4.2</version>
</dependency>
<dependency>
<groupId>org.cloudhoist</groupId>
<artifactId>crontab</artifactId>
- <version>0.4.0</version>
+ <version>0.4.1</version>
</dependency>
<dependency>
@@ -262,7 +267,7 @@
</scm>
<properties>
- <pallet.version>0.4.8-SNAPSHOT</pallet.version>
+ <pallet.version>0.4.17-SNAPSHOT</pallet.version>
<jclouds.version>1.0-beta-8</jclouds.version>
<pallet.ci.node-count>1</pallet.ci.node-count>
</properties>
View
@@ -1,18 +1,22 @@
-(ns pallet.ci
- "Run script"
- (:require
- [pallet.core :as core]
- [pallet.compute :as compute]
- [pallet.compute.jclouds :as jclouds]
- [pallet.node.ci :as ci]))
+;; Run script
+(require
+ '[pallet.core :as core]
+ '[pallet.compute :as compute]
+ '[pallet.compute.jclouds :as jclouds]
+ '[pallet.node.ci :as ci]
+ '[clojure.contrib.logging :as logging])
(def node-count-property "pallet.ci.node-count")
-(defn converge
- []
- (if-let [service (compute/compute-service-from-config-file :ci)]
+
+(if-let [service (compute/compute-service-from-config-file :ci)]
+ (try
(let [node-count (read-string
(or (System/getProperty node-count-property) "1"))]
(core/converge {ci/ci node-count} :compute service :phase :configure))
- (binding [*out* *err*]
- (println "Could not find :ci service in config.clj"))))
+ (System/exit 0)
+ (catch Exception e
+ (logging/error "Unexpected error" e)
+ (System/exit 1)))
+ (binding [*out* *err*]
+ (println "Could not find :ci service in config.clj")))
Oops, something went wrong.

0 comments on commit 18bc944

Please sign in to comment.