|
|
|
@ -46,6 +46,8 @@ SUDO_PASSWORD="" |
|
|
|
INIT_TAG="0" |
|
|
|
#--- 指令参数 |
|
|
|
JENKINS_AGENT="" |
|
|
|
JENKINS_AGENT_JNLP_URL="" |
|
|
|
JENKINS_AGENT_SECRET="" |
|
|
|
GIT_TAG="1" |
|
|
|
JAVA_TAG="1" |
|
|
|
GRADLE_VERSION="6.8.3" |
|
|
|
@ -238,8 +240,8 @@ function init:jenkins_agent() { |
|
|
|
cat << EOF > ${BASE_DIR}/start.sh |
|
|
|
#!/bin/bash |
|
|
|
|
|
|
|
jnlpUrl='' |
|
|
|
secret='' |
|
|
|
jnlpUrl='${JENKINS_AGENT_JNLP_URL}' |
|
|
|
secret='${JENKINS_AGENT_SECRET}' |
|
|
|
workDir='${BASE_DIR}/workspace' |
|
|
|
|
|
|
|
#------------------------------------------------------------------- |
|
|
|
@ -415,6 +417,8 @@ Available Commands: |
|
|
|
Flag: |
|
|
|
-base-dir 新增用户名, 默认: '/data/jenkins-agent' |
|
|
|
-agent jenkins-agent下载地址(\${JENKINS_URL}/jnlpJars/agent.jar)， 默认: '' |
|
|
|
-jnlpUrl jenkins-agent的jnlpUrl参数(\${JENKINS_URL}/computer/\${AGENT_NAME}/jenkins-agent.jnlp)， 默认: '' |
|
|
|
-secret jenkins-agent的secret参数， 默认: '' |
|
|
|
-git 是否安装git, 默认: '1' |
|
|
|
-java 是否安装java(8, 11, 17), 默认: '1' |
|
|
|
-gradle 安装gradle版本(6.8.3 | 6.9.3 | 7.4.2 | 7.5.1), 默认: '6.8.3' |
|
|
|
@ -425,6 +429,8 @@ Example: |
|
|
|
jenkins-agent-install-centos.sh init \\ |
|
|
|
-base-dir '/data/jenkins-agent' \\ |
|
|
|
-agent '' \\ |
|
|
|
-jnlpUrl '' \\ |
|
|
|
-secret '' \\ |
|
|
|
-git 0 \\ |
|
|
|
-java 0 \\ |
|
|
|
-gradle '6.8.3' \\ |
|
|
|
@ -449,6 +455,12 @@ while [ "${1:-}" != "" ]; do |
|
|
|
-agent ) shift |
|
|
|
JENKINS_AGENT=${1:-JENKINS_AGENT} |
|
|
|
;; |
|
|
|
-jnlpUrl ) shift |
|
|
|
JENKINS_AGENT_JNLP_URL=${1:-JENKINS_AGENT_JNLP_URL} |
|
|
|
;; |
|
|
|
-secret ) shift |
|
|
|
JENKINS_AGENT_SECRET=${1:-JENKINS_AGENT_SECRET} |
|
|
|
;; |
|
|
|
-git ) shift |
|
|
|
GIT_TAG=${1:-GIT_TAG} |
|
|
|
;; |
|
|
|
|
