jmx ports field don't throw warning if environment property used

 java options for nodes should be added  last

Author: amikryukov

src/main/java/com/griddynamics/jagger/jenkins/plugin/SuT.java

@@ -110,11 +110,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();
         }
     }
 }

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 2>&1"
 

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,7 @@ 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}
+    ${additional-properties} \\${end}${if java-options}
+    ${java-options} \\${end}
  > /dev/null 2>&1"
 

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