From bb8daeac880109b61407707c424c5d6baa7aa77c Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Thu, 24 Oct 2024 14:04:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E7=BD=B2=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 k8s/build.sh            | 19 -------------------
 k8s/build_and_deploy.sh | 28 +++++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/k8s/build.sh b/k8s/build.sh
index a84e56f1..e8f19b3c 100755
--- a/k8s/build.sh
+++ b/k8s/build.sh
@@ -41,25 +41,6 @@ fi
 baseDir="/home/somuns/ci4s"
 cd ${baseDir}
 
-# 拉取指定分支的最新代码
-echo "Checking out and pulling branch $branch..."
-
-git stash
-git checkout $branch
-if [ $? -ne 0 ]; then
-    echo "切换到分支 $branch 失败，请检查分支名称是否正确！"
-    exit 1
-fi
-
-git stash
-git pull origin $branch
-if [ $? -ne 0 ]; then
-    echo "拉取代码失败，请检查网络或联系管理员！"
-    exit 1
-fi
-
-chmod +777 ${baseDir}/k8s/*.sh
-
 # 创建目录
 mkdir -p ${baseDir}/k8s/dockerfiles/jar
 mkdir -p ${baseDir}/k8s/dockerfiles/html
diff --git a/k8s/build_and_deploy.sh b/k8s/build_and_deploy.sh
index eacc9c6b..8a9aee0d 100755
--- a/k8s/build_and_deploy.sh
+++ b/k8s/build_and_deploy.sh
@@ -3,11 +3,6 @@
 #记录开始时间
 startTime=$(date +%s)
 
-# 登录到目标环境
-baseDir="/home/somuns/ci4s"
-cd ${baseDir}
-
-
 #build
 # 默认参数
 branch="master"
@@ -50,6 +45,29 @@ if [[ ! " ${valid_envs[@]} " =~ " $env " ]]; then
   exit 1
 fi
 
+# 拉取指定分支的最新代码
+echo "Checking out and pulling branch $branch..."
+
+git stash
+git checkout $branch
+if [ $? -ne 0 ]; then
+    echo "切换到分支 $branch 失败，请检查分支名称是否正确！"
+    exit 1
+fi
+
+git stash
+git pull origin $branch
+if [ $? -ne 0 ]; then
+    echo "拉取代码失败，请检查网络或联系管理员！"
+    exit 1
+fi
+
+chmod +777 ${baseDir}/k8s/*.sh
+
+# 登录到目标环境
+baseDir="/home/somuns/ci4s"
+cd ${baseDir}
+
 echo "start build"
 sh ${baseDir}/k8s/build.sh -b ${branch} -s ${service}
 if [ $? -ne 0 ]; then