08jenkins-agent-install-centos.sh

00base/08jenkins-agent-install-centos.sh

@@ -228,7 +228,7 @@ function init:mkdir() {
 
 # 安装git环境
 function init:git() {
-  log::info "[git]" "安装git环境..."
+  log::info "[git]" "安装git..."
   local host="127.0.0.1"
   command::exec "${host}" "
     sudo yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm
@@ -237,30 +237,50 @@ function init:git() {
     git config --global credential.helper store
   "
   check::exit_code "$?" "git" "$host 安装git环境" "exit"
-  log::info "[git]" "git环境安装成功!"
+  log::info "[git]" "git安装成功!"
 }
 
 # 安装java环境
 function init:java() {
-  log::info "[java]" "安装java环境..."
+  log::info "[java]" "安装java..."
   local host="127.0.0.1"
-#  local java_path="${BASE_DIR}/java/${JDK_DIR_NAME}"
+  # jdk8
-#  command::exec "${host}" "
+  local java8_path="${BASE_DIR}/java/${JDK8_DIR_NAME}"
-#    if [ ! -d "$java_path" ]; then
+  command::exec "${host}" "
-#      mkdir -p ${BASE_DIR}/java
+    if [ ! -d "$java8_path" ]; then
-#      wget --timeout=10 --waitretry=3 --tries=5 --retry-connrefused --no-check-certificate ${JDK_URL} -O ${BASE_DIR}/java/${JDK_FILE_NAME}
+      mkdir -p ${BASE_DIR}/java
-#      cd ${BASE_DIR}/java
+      wget --timeout=10 --waitretry=3 --tries=5 --retry-connrefused --no-check-certificate ${JDK8_URL} -O ${BASE_DIR}/java/${JDK8_FILE_NAME}
-#      tar -zxvf ${JDK_FILE_NAME}
+      cd ${BASE_DIR}/java
-#      sudo chown -R $(id -u):$(id -g) ${BASE_DIR}/java
+      tar -zxvf ${JDK8_FILE_NAME}
-#    fi
+      sudo chown -R \$(id -u):\$(id -g) ${BASE_DIR}/java
-#  "
+    fi
-#  check::exit_code "$?" "java" "$host 安装java环境" "exit"
+  "
-#  if [[ "${ADD_USER_TAG:-}" == "1" ]]; then
+  check::exit_code "$?" "java" "$host 安装java8" "exit"
-#    command::exec "${host}" "
+  # jdk11
-#      sudo chown -R \$(id -u ${ADD_USER_NAME}):\$(id -g ${ADD_USER_NAME}) ${BASE_DIR}/java
+  local java11_path="${BASE_DIR}/java/${JDK11_DIR_NAME}"
-#    "
+  command::exec "${host}" "
-#  fi
+    if [ ! -d "$java11_path" ]; then
-  log::info "[java]" "java环境安装成功!"
+      mkdir -p ${BASE_DIR}/java
+      wget --timeout=10 --waitretry=3 --tries=5 --retry-connrefused --no-check-certificate ${JDK11_URL} -O ${BASE_DIR}/java/${JDK11_FILE_NAME}
+      cd ${BASE_DIR}/java
+      tar -zxvf ${JDK11_FILE_NAME}
+      sudo chown -R \$(id -u):\$(id -g) ${BASE_DIR}/java
+    fi
+  "
+  check::exit_code "$?" "java" "$host 安装java11" "exit"
+  # jdk17
+  local java17_path="${BASE_DIR}/java/${JDK17_DIR_NAME}"
+  command::exec "${host}" "
+    if [ ! -d "$java17_path" ]; then
+      mkdir -p ${BASE_DIR}/java
+      wget --timeout=10 --waitretry=3 --tries=5 --retry-connrefused --no-check-certificate ${JDK17_URL} -O ${BASE_DIR}/java/${JDK17_FILE_NAME}
+      cd ${BASE_DIR}/java
+      tar -zxvf ${JDK17_FILE_NAME}
+      sudo chown -R \$(id -u):\$(id -g) ${BASE_DIR}/java
+    fi
+  "
+  check::exit_code "$?" "java" "$host 安装java17" "exit"
+  log::info "[java]" "java安装成功!"
 }
 
 # 安装gradle环境
@@ -361,7 +381,7 @@ Available Commands:
 Flag:
   -base-dir           新增用户名, 默认: '/data/jenkins-agent/env'
   -git                是否安装git, 默认: '1'
-  -java               是否安装java, 默认: '1'
+  -java               是否安装java(8, 11, 17), 默认: '1'
   -gradle             安装gradle版本, 默认: '6.8.3'
   -maven              是否安装maven环境, 默认: '3.8.6'
   -nodejs             是否安装nodejs环境, 默认: '16.18.0'
@@ -415,6 +435,7 @@ log::info "[start]" "bash $0 ${SCRIPT_PARAMETER}"
 # 动作
 if [[ "${INIT_TAG:-}" == "1" ]]; then
   check::command
+  init:mkdir
   [[ "${GIT_TAG:-}" == "1" ]] && { init:git; }
   [[ "${JAVA_TAG:-}" == "1" ]] && { init:java; }
   [[ "${GRADLE_TAG:-}" == "1" ]] && { init:gradle; }