diff --git a/00base/08jenkins-agent-install-centos.sh b/00base/08jenkins-agent-install-centos.sh index c7e3bfe..862e900 100644 --- a/00base/08jenkins-agent-install-centos.sh +++ b/00base/08jenkins-agent-install-centos.sh @@ -225,25 +225,33 @@ function init:jenkins_agent() { local host="127.0.0.1" local agent_dir=`` local agent_file="${BASE_DIR}/agent.jar" - local java_mem_opts=" -DappName=jenkins -server -Xmx1g" - local database_opts=" -Ddatabase.codeset=ISO-8859-1 -Ddatabase.logging=false" - local java_opts_ext=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dapplication.codeset=UTF-8 -Dfile.encoding=UTF-8 -Duser.timezone=Asia/Shanghai" + local java_mem_opts=' -DappName=jenkins -server -Xmx1g' + local database_opts=' -Ddatabase.codeset=ISO-8859-1 -Ddatabase.logging=false' + local java_opts_ext=' -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dapplication.codeset=UTF-8 -Dfile.encoding=UTF-8 -Duser.timezone=Asia/Shanghai' command::exec "${host}" " if [ ! -f "$agent_file" ]; then mkdir -p ${BASE_DIR}/workspace wget --timeout=10 --no-check-certificate ${JENKINS_AGENT} -O $agent_file cd ${BASE_DIR} + # 写文件start.sh文件 cat << EOF > ${BASE_DIR}/start.sh #!/bin/bash -java='${BASE_DIR}/env/java/${JDK11_DIR_NAME}/bin/java' jnlpUrl='' secret='' 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' +#------------------------------------------------------------------- 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正在运行...'