|
|
@@ -244,14 +244,14 @@ workDir='${BASE_DIR}/workspace'
|
|
|
|
|
|
#-------------------------------------------------------------------
|
|
|
java='${BASE_DIR}/env/java/${JDK11_DIR_NAME}/bin/java'
|
|
|
-local agent_file='$agent_file'
|
|
|
-local java_mem_opts='$java_opts_ext'
|
|
|
-local database_opts='$database_opts'
|
|
|
-local java_opts_ext='$java_opts_ext'
|
|
|
+agent_file='$agent_file'
|
|
|
+java_mem_opts='$java_opts_ext'
|
|
|
+database_opts='$database_opts'
|
|
|
+java_opts_ext='$java_opts_ext'
|
|
|
#-------------------------------------------------------------------
|
|
|
pid=\\\`ps -ef | grep 'DappName=jenkins-agent' | grep -v 'grep' | awk '{print \\\$2}'\\\`
|
|
|
if [ -z \\\$pid ];then
|
|
|
- nohup \\\$java \\\$java_mem_opts \\\$database_opts \\\$java_opts_ext -jar \\\$agent_file -jnlpUrl '\\\$jnlpUrl' -secret '\\\$secret' -workDir '\\\$workDir' >${BASE_DIR}/agent-logs.log 2>&1 &
|
|
|
+ nohup \\\$java \\\$java_mem_opts \\\$database_opts \\\$java_opts_ext -jar \\\$agent_file -jnlpUrl \\\$jnlpUrl -secret \\\$secret -workDir \\\$workDir >${BASE_DIR}/agent-logs.log 2>&1 &
|
|
|
echo 'jenkins-agent启动成功!'
|
|
|
else
|
|
|
echo 'jenkins-agent正在运行...'
|
