merge commit

amikryukov · amikryukov · commit ecad99056034 · 2014-01-30T18:25:54.000+04:00
diff --git a/src/main/java/com/griddynamics/jagger/jenkins/plugin/JaggerEasyDeployPlugin.java b/src/main/java/com/griddynamics/jagger/jenkins/plugin/JaggerEasyDeployPlugin.java
@@ -53,6 +53,8 @@ public class JaggerEasyDeployPlugin extends Builder
 
     private transient Engine transformEngine;
 
+    private final Map<String, Integer> errorCodes = new HashMap<String, Integer>();
+
     /**
      * Constructor where fields from *.jelly will be passed
      * @param sutsList
@@ -205,9 +207,16 @@ private String generateScript() throws IOException {
         args.put("collecting-results", collectResults());
         args.put("stopping-agents", stopAgents());
 
+        loadErrorCodes();
+        args.putAll(errorCodes);
+
         return transformEngine.transform(ScriptTemplate.MAIN.getTemplateString(), args);
     }
 
+    private void loadErrorCodes() {
+        errorCodes.put("error-code-agent-not-running", 256);
+    }
+
 
     private String stopAgents() throws IOException {
 
@@ -318,6 +327,7 @@ private String checkAgent(SuT node) throws IOException {
 
         Map <String,Object> args = new HashMap<String, Object>();
         addNodeProperties(args, node);
+        args.put("fail-if-not-running", node.isFailIfNotRunning());
 
         return transformEngine.transform(ScriptTemplate.CHECK_AGENT.getTemplateString(), args);
     }
diff --git a/src/main/java/com/griddynamics/jagger/jenkins/plugin/SuT.java b/src/main/java/com/griddynamics/jagger/jenkins/plugin/SuT.java
@@ -29,16 +29,20 @@ public class SuT extends Node implements Describable<SuT> {
 
     private final String jmxPort;
 
+    private final boolean failIfNotRunning;
+
     private String jmxPortActual;
 
     @DataBoundConstructor
     public SuT(String serverAddress, String userName, String sshKeyPath,
-               String jmxPort, boolean useJmx, boolean setJavaHome, String javaHome, String javaOptions){
+               String jmxPort, boolean useJmx, boolean setJavaHome,
+               String javaHome, String javaOptions, boolean failIfNotRunning) {
 
-         super(serverAddress, userName, sshKeyPath, setJavaHome, javaHome, javaOptions);
+        super(serverAddress, userName, sshKeyPath, setJavaHome, javaHome, javaOptions);
 
         this.jmxPort = jmxPort;
         this.useJmx = useJmx;
+        this.failIfNotRunning = failIfNotRunning;
 
         setJmxPortActual(jmxPort);
     }
@@ -48,6 +52,10 @@ public String getJmxPortActual() {
         return jmxPortActual;
     }
 
+    public boolean isFailIfNotRunning() {
+        return failIfNotRunning;
+    }
+
     public void setJmxPortActual(String jmxPortActual) {
         this.jmxPortActual = jmxPortActual;
     }
@@ -110,11 +118,12 @@ public FormValidation doCheckJmxPort(@QueryParameter String value) {
 
             if(value == null || value.matches("\\s*")) {
                 return FormValidation.warning("Set JMX Port(s)");
+            } else if (value.contains("$")) {
+                return FormValidation.ok();
             } else if (!value.matches("\\d+(,\\d+)*")) {
                 return FormValidation.error("wrong format: split with comas");
-            } else {
-                return FormValidation.ok();
             }
+            return FormValidation.ok();
         }
     }
 }
diff --git a/src/main/resources/com/griddynamics/jagger/jenkins/plugin/JaggerComparisonPlugin/config.jelly b/src/main/resources/com/griddynamics/jagger/jenkins/plugin/JaggerComparisonPlugin/config.jelly
@@ -2,7 +2,9 @@
   <f:entry title="Path to Jagger output xml file" field="path">
     <f:textbox />
   </f:entry>
-  <f:entry title="Stop and set the build to 'failed' status if there are errors when processing a result file" field="stopOnErrors">
-    <f:checkbox default="checked"/>
+
+  <f:entry field="stopOnErrors"
+       title="Stop and set the build status to 'failed', if there are errors when processing a result file">
+       <f:booleanRadio />
   </f:entry>
 </j:jelly>
diff --git a/src/main/resources/com/griddynamics/jagger/jenkins/plugin/SuT/config.jelly b/src/main/resources/com/griddynamics/jagger/jenkins/plugin/SuT/config.jelly
@@ -1,5 +1,9 @@
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 
+        <f:entry field="failIfNotRunning"
+                 title="Fail job if agent didn't started">
+              <f:booleanRadio />
+        </f:entry>
 
         <f:entry title = "Address" >
             <f:textbox field = "serverAddress" />
diff --git a/src/main/resources/com/griddynamics/jagger/jenkins/plugin/script/agent.checking.script b/src/main/resources/com/griddynamics/jagger/jenkins/plugin/script/agent.checking.script
@@ -3,6 +3,10 @@ echo "Checking Agent ${server-address}"
 JOUT=$(ssh${ssh-key-path} ${user-name}@${server-address} "pgrep -f AgentStarter")
 
 	if [ -z "$JOUT" ] ; then
-		echo "No AgentStarter running on ${server-address}"
-		exit $JOUT
+		echo "No AgentStarter running on ${server-address}" 1>&2;
+
+		FAIL_IF_AGENT_NOT_RUNNING="${fail-if-not-running}"
+		if [ $FAIL_IF_AGENT_NOT_RUNNING = "true" ] ; then
+ 		    exit $ERROR_CODE_AGENT_NOT_RUNNING
+		fi
 	fi
diff --git a/src/main/resources/com/griddynamics/jagger/jenkins/plugin/script/agent.starting.script b/src/main/resources/com/griddynamics/jagger/jenkins/plugin/script/agent.starting.script
@@ -1,11 +1,11 @@
 
 
 echo "Starting Agent ${server-address}"
-ssh -f${ssh-key-path} ${user-name}@${server-address} "cd ${jagger-home};${if java-home}export JAVA_HOME=${java-home};${end} ./start_agent.sh  \\${if java-options}
-    ${java-options} \\${end}
+ssh -f${ssh-key-path} ${user-name}@${server-address} "cd ${jagger-home};${if java-home}export JAVA_HOME=${java-home};${end} ./start_agent.sh  \\
     -Dchassis.coordination.http.url=http://${master-server-address}:${if http-port}${http-port}${else}8089${end} \\
     -Djmx.enabled=${jmx-enabled} \\${if jmx-ports}
     -Djmx.services=${foreach jmx-ports port}${if last_port}localhost:${port}${else}localhost:${port},${end}${end} \\${end}${if additional-properties}
-    ${additional-properties} \\${end}
+    ${additional-properties} \\${end}${if java-options}
+    ${java-options} \\${end}
  > /dev/null"
 
diff --git a/src/main/resources/com/griddynamics/jagger/jenkins/plugin/script/kernel.starting.script b/src/main/resources/com/griddynamics/jagger/jenkins/plugin/script/kernel.starting.script
@@ -1,7 +1,6 @@
 
 echo "Starting Kernel ${server-address}"
-ssh -f${ssh-key-path} ${user-name}@${server-address} "cd ${jagger-home};${if java-home}export JAVA_HOME=${java-home};${end} ./start.sh ${jagger-properties}  \\${if java-options}
-    ${java-options} \\${end}
+ssh -f${ssh-key-path} ${user-name}@${server-address} "cd ${jagger-home};${if java-home}export JAVA_HOME=${java-home};${end} ./start.sh ${jagger-properties}  \\
 	-Dchassis.storage.rdb.client.driver=${db-driver} \\
 	-Dchassis.storage.rdb.client.url=${db-url} \\
 	-Dchassis.storage.rdb.username=${db-user-name} \\
@@ -10,6 +9,6 @@ ssh -f${ssh-key-path} ${user-name}@${server-address} "cd ${jagger-home};${if jav
 	-Dchassis.roles=KERNEL \\
 	-Dchassis.coordinator.zookeeper.endpoint=${master-server-address}:${if zookeeper-port}${zookeeper-port}${else}2181${end} \\
 	-Dchassis.storage.fs.default.name=hdfs://${master-server-address}/ \\${if additional-properties}
-    ${additional-properties} \\${end}
- > /dev/null"
-
+    ${additional-properties} \\${end}${if java-options}
+    ${java-options} \\${end}
+> /dev/null"
diff --git a/src/main/resources/com/griddynamics/jagger/jenkins/plugin/script/main.script b/src/main/resources/com/griddynamics/jagger/jenkins/plugin/script/main.script
@@ -4,6 +4,8 @@ rm -rf ${base-directory}
 sleep 2
 mkdir ${base-directory}
 
+#Error codes:
+ERROR_CODE_AGENT_NOT_RUNNING=${error-code-agent-not-running}
 
 echo "Deploying"
 ${deploying}
diff --git a/src/main/resources/com/griddynamics/jagger/jenkins/plugin/script/master.starting.script b/src/main/resources/com/griddynamics/jagger/jenkins/plugin/script/master.starting.script
@@ -1,6 +1,5 @@
 echo "Starting Master ${server-address}"
-ssh${ssh-key-path} ${user-name}@${server-address} "cd ${jagger-home};${if java-home}export JAVA_HOME=${java-home};${end} ./start.sh ${jagger-properties}  \\${if java-options}
-    ${java-options} \\${end}${if min-agents}
+ssh${ssh-key-path} ${user-name}@${server-address} "cd ${jagger-home};${if java-home}export JAVA_HOME=${java-home};${end} ./start.sh ${jagger-properties}  \\${if min-agents}
     -Dchassis.conditions.min.agents.count=${min-agents} \\${end}${if min-kernels}
     -Dchassis.conditions.min.kernels.count=${if min-kernels=0}1${else}${min-kernels}${end} \\${end}
     -Dchassis.storage.rdb.client.driver=${db-driver} \\
@@ -11,7 +10,8 @@ ssh${ssh-key-path} ${user-name}@${server-address} "cd ${jagger-home};${if java-h
     -Dchassis.roles=MASTER,COORDINATION_SERVER,HTTP_COORDINATION_SERVER${if min-kernels=0},KERNEL${end}${if h2-db},RDB_SERVER${end} \\
     -Dchassis.coordinator.zookeeper.endpoint=${server-address}:${if zookeeper-port}${zookeeper-port}${else}2181${end} \\
     -Dchassis.storage.fs.default.name=hdfs://${server-address}/ ${if additional-properties}\\
-    ${additional-properties}${end} "
+    ${additional-properties}${end}${if java-options}  \\
+    ${java-options} ${end} "
 	status=$?
 	if [ "$status" -ne 0 ] ; then
 		exit $status

Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,20 @@ public class SuT extends Node implements Describable<SuT> {`
`29`	`29`
`30`	`30`	`private final String jmxPort;`
`31`	`31`
	`32`	`+ private final boolean failIfNotRunning;`
	`33`	`+`
`32`	`34`	`private String jmxPortActual;`
`33`	`35`
`34`	`36`	`@DataBoundConstructor`
`35`	`37`	`public SuT(String serverAddress, String userName, String sshKeyPath,`
`36`		`- String jmxPort, boolean useJmx, boolean setJavaHome, String javaHome, String javaOptions){`
	`38`	`+ String jmxPort, boolean useJmx, boolean setJavaHome,`
	`39`	`+ String javaHome, String javaOptions, boolean failIfNotRunning) {`
`37`	`40`
`38`		`- super(serverAddress, userName, sshKeyPath, setJavaHome, javaHome, javaOptions);`
	`41`	`+ super(serverAddress, userName, sshKeyPath, setJavaHome, javaHome, javaOptions);`
`39`	`42`
`40`	`43`	`this.jmxPort = jmxPort;`
`41`	`44`	`this.useJmx = useJmx;`
	`45`	`+ this.failIfNotRunning = failIfNotRunning;`
`42`	`46`
`43`	`47`	`setJmxPortActual(jmxPort);`
`44`	`48`	`}`
`@@ -48,6 +52,10 @@ public String getJmxPortActual() {`
`48`	`52`	`return jmxPortActual;`
`49`	`53`	`}`
`50`	`54`
	`55`	`+ public boolean isFailIfNotRunning() {`
	`56`	`+ return failIfNotRunning;`
	`57`	`+ }`
	`58`	`+`
`51`	`59`	`public void setJmxPortActual(String jmxPortActual) {`
`52`	`60`	`this.jmxPortActual = jmxPortActual;`
`53`	`61`	`}`
`@@ -110,11 +118,12 @@ public FormValidation doCheckJmxPort(@QueryParameter String value) {`
`110`	`118`
`111`	`119`	`if(value == null \|\| value.matches("\\s*")) {`
`112`	`120`	`return FormValidation.warning("Set JMX Port(s)");`
	`121`	`+ } else if (value.contains("$")) {`
	`122`	`+ return FormValidation.ok();`
`113`	`123`	`} else if (!value.matches("\\d+(,\\d+)*")) {`
`114`	`124`	`return FormValidation.error("wrong format: split with comas");`
`115`		`- } else {`
`116`		`- return FormValidation.ok();`
`117`	`125`	`}`
	`126`	`+ return FormValidation.ok();`
`118`	`127`	`}`
`119`	`128`	`}`
`120`	`129`	`}`