From 133bc66bcf9eca636163e56ed8318705d73007b4 Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Thu, 25 Mar 2021 10:54:32 +0800
Subject: [PATCH] update

---
 build.py               | 2 +-
 script/internal.sh     | 3 ---
 script/setup_env.sh    | 4 +++-
 script/tools/chroot.sh | 3 ++-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.py b/build.py
index f882f66..7355c83 100644
--- a/build.py
+++ b/build.py
@@ -99,7 +99,7 @@ class Build(object):
             return -1
 
         if step:
-            cmd = 'echo "export STEP=%s" >> script/setup_env.sh' % step
+            cmd = "sed -i '1i export STEP=%s' script/setup_env.sh" % step
             if os.system(cmd) != 0:
                 logger.error("build fail")
                 return -1
diff --git a/script/internal.sh b/script/internal.sh
index 46eba03..9318936 100644
--- a/script/internal.sh
+++ b/script/internal.sh
@@ -32,9 +32,6 @@ fi
 set -ue
 
 export VERSION="${CI_PROJECT}"
-export CMC_BASEDIR="/usr1"
-export JENKINS_URL="http://114.116.250.98/jenkins/job"
-export OPENEULER_CHROOT_PATH="/usr1/openeuler"
 
 #configure for icp_ci
 export ICP_CI_IP=""
diff --git a/script/setup_env.sh b/script/setup_env.sh
index 3515dde..de256ac 100644
--- a/script/setup_env.sh
+++ b/script/setup_env.sh
@@ -3,7 +3,9 @@ export OBS_STANDARD_PROJECT="openEuler:Mainline"
 export OBS_EPOL_PROJECT="openEuler:Epol"
 export OBS_EXTRAS_PROJECT="openEuler:Extras"
 #===================================
-export OPENEULER_CHROOT_PATH="/usr1/openeuler"
+export CMC_BASEDIR="/jenkins_home"
+export OPENEULER_CHROOT_PATH="${CMC_BASEDIR}/openeuler_${STEP}"
+export JENKINS_URL="http://114.116.250.98/jenkins/job"
 export OS_NAME="openEuler"
 tmp="$(echo ${OBS_STANDARD_PROJECT#*:})"
 export OS_VERSION="$(echo ${tmp//:/-})"
diff --git a/script/tools/chroot.sh b/script/tools/chroot.sh
index 5cbc14d..f5782ac 100644
--- a/script/tools/chroot.sh
+++ b/script/tools/chroot.sh
@@ -18,6 +18,7 @@ function chroot_init()
     wget -q -r -l1 -nd -A 'openEuler_chroot-*.noarch.rpm' "${OBS_EXTRAS_REPO_URL}/noarch/" &> /dev/null
     rpm -ivh openEuler_chroot-*.noarch.rpm
     rm -f openEuler_chroot-*.noarch.rpm
+    mkdir -p ${OPENEULER_CHROOT_PATH}/home
     cp -a "${BUILD_SCRIPT_DIR}"/* "${OPENEULER_CHROOT_PATH}/home"
     mkdir -p "${OPENEULER_CHROOT_PATH}/root/.ssh/"
     cp ~/.ssh/super_publish_rsa "${OPENEULER_CHROOT_PATH}/root/.ssh/"
@@ -35,7 +36,7 @@ function chroot_clean()
     rpm -e openEuler_chroot
     if [ -d "${OPENEULER_CHROOT_PATH}" ]; then
         lsof | grep openeuler
-        for openeuler_pid in $(lsof | grep '/usr1/openeuler/' | awk '{print $2}')
+        for openeuler_pid in $(lsof | grep "${OPENEULER_CHROOT_PATH}" | awk '{print $2}')
         do
             kill -9 "${openeuler_pid}"
         done
-- 
Gitee