diff --git a/script/make_version.sh b/script/make_version.sh
index d59b42837d8b7848a0543e1d6e76d2e987d7576f..e9d1f6908be8b810b0da50b60576a8944ef339ec 100644
--- a/script/make_version.sh
+++ b/script/make_version.sh
@@ -42,12 +42,12 @@ function get_repose()
 }
 for((i=0;i<3;i++));
 do
-ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa root@${RELEASE_SERVER_IP} ip addr | grep "172." | tr -cd "[0-9].[0-9]/ " | awk '{print $3}' | awk -F "/" '{print $1}')
+ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa -p ${RELEASE_SERVER_PORT} root@${RELEASE_SERVER_IP} ip addr | grep "172." | tr -cd "[0-9].[0-9]/ " | awk '{print $3}' | awk -F "/" '{print $1}')
 if [ "$ret" != "${RELEASE_SERVER_IP}" ];then
     break
 fi
 done
-#sed -i "s/RELEASE_SERVER_IP=\"${RELEASE_SERVER_IP}\"/RELEASE_SERVER_IP=\"$ret\"/g" "${BUILD_SCRIPT_DIR}"/setup_env.sh
+sed -i "s/RELEASE_SERVER_IP=\"${RELEASE_SERVER_IP}\"/RELEASE_SERVER_IP=\"$ret\"/g" "${BUILD_SCRIPT_DIR}"/setup_env.sh
 #sh "${BUILD_SCRIPT_DIR}"/tools/safe_sshcmd.sh -c "ip add | grep 172 | awk -F '/' '{print \$1}'| awk '{print \$2}'" -m ${RELEASE_SERVER_IP} -u "root" -p "xxxx" -t 120 -n 3
 #if echo "${CI_PROJECT}" | grep '_gcov'; then
 #    modify_for_gcov "${BUILD_SCRIPT_DIR}"
diff --git a/script/setup_env.sh b/script/setup_env.sh
index 6562cd9210387621eea0cf2af615a6a584350950..291e6a7bda89f4d715c8dd9bb41843c37c4255e5 100644
--- a/script/setup_env.sh
+++ b/script/setup_env.sh
@@ -10,7 +10,8 @@ export OS_VERSION="$(echo ${tmp//:/-})"
 
 export OBS_UI_IP="172.16.1.81"
 export OBS_SERVER_IP="172.16.1.95"
-export RELEASE_SERVER_IP="172.17.4.28"
+export RELEASE_SERVER_IP="172.16.1.241"
+export RELEASE_SERVER_PORT="30322"
 export ARCH=$(uname -m)
 export RELEASE_HTTP_URL="http://121.36.84.172/dailybuild"
 
@@ -86,3 +87,11 @@ EOF
 
 cat ${OBS_REPO_CONF}
 
+
+if [ -n "${RELEASE_SERVER_PORT}" ];then
+    export SSHPORT="-p ${RELEASE_SERVER_PORT}"
+    export SCPPORT="-P ${RELEASE_SERVER_PORT}"
+else
+    export SSHPORT=""
+    export SCPPORT=""
+fi
diff --git a/script/step/make_debug_everything.sh b/script/step/make_debug_everything.sh
index 8040b9cf6a2b648fef8ba1a0021def999f9d9ae0..7c2d49944c48ed794de672af4f862f264a267a73 100644
--- a/script/step/make_debug_everything.sh
+++ b/script/step/make_debug_everything.sh
@@ -78,10 +78,10 @@ function make_debug_everything_inchroot()
     sshcmd "${SSH_CMD}"
     sshscp "${TGZ_NAME} ${TGZ_NAME}${SHA256SUM}" "${RELEASE_DIR}"
     set +e
-    ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa root@${RELEASE_SERVER_IP} mount | grep ${RELEASE_VERSION_DIR} | grep OS/${ARCH} | awk '{print $3}')
+    ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa ${SSHPORT} root@${RELEASE_SERVER_IP} mount | grep ${RELEASE_VERSION_DIR} | grep OS/${ARCH} | awk '{print $3}')
     for mp in $ret
     do
-        ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa root@${RELEASE_SERVER_IP} umount $mp)
+        ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa ${SSHPORT} root@${RELEASE_SERVER_IP} umount $mp)
     done
     SSH_CMD="mount -t iso9660 -o loop ${RELEASE_DIR}/${TGZ_NAME} ${MOUNT_DIR}"
     sshcmd "${SSH_CMD}"
diff --git a/script/step/make_iso.sh b/script/step/make_iso.sh
index 744ccc4205eea217a88c0d11b7efa77b4b8c37d0..d9ef36d7220e5093264e4ed0e2b0e8470794189b 100644
--- a/script/step/make_iso.sh
+++ b/script/step/make_iso.sh
@@ -78,10 +78,10 @@ function make_iso_inchroot()
     sshcmd "${SSH_CMD}"
     sshscp "${TGZ_NAME} ${TGZ_NAME}${SHA256SUM} ${iso_rpmlist}" "${RELEASE_DIR}"
     set +e
-    ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa root@${RELEASE_SERVER_IP} mount | grep ${RELEASE_VERSION_DIR} | grep OS/${ARCH} | awk '{print $3}')
+    ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa ${SSHPORT} root@${RELEASE_SERVER_IP} mount | grep ${RELEASE_VERSION_DIR} | grep OS/${ARCH} | awk '{print $3}')
     for mp in $ret
     do
-        ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa root@${RELEASE_SERVER_IP} umount $mp)
+        ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa ${SSHPORT} root@${RELEASE_SERVER_IP} umount $mp)
     done
     SSH_CMD="mount -t iso9660 -o loop ${RELEASE_DIR}/${TGZ_NAME} ${MOUNT_DIR}"
     sshcmd "${SSH_CMD}"
diff --git a/script/step/make_iso_everysrc.sh b/script/step/make_iso_everysrc.sh
index 2db2a071f0bd4cc2f834f218205f19f2b3613259..cc943c2ac6f84b872660463f1b2edaa15c1e98c5 100644
--- a/script/step/make_iso_everysrc.sh
+++ b/script/step/make_iso_everysrc.sh
@@ -81,10 +81,10 @@ function make_iso_everysrc_inchroot()
     sshcmd "${SSH_CMD}"
     sshscp "${TGZ_NAME} ${TGZ_NAME}${SHA256SUM}" "${RELEASE_DIR}"
     set +e
-    ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa root@${RELEASE_SERVER_IP} mount | grep ${RELEASE_VERSION_DIR} | grep source | awk '{print $3}')
+    ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa ${SSHPORT} root@${RELEASE_SERVER_IP} mount | grep ${RELEASE_VERSION_DIR} | grep source | awk '{print $3}')
     for mp in $ret
     do
-        ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa root@${RELEASE_SERVER_IP} umount $mp)
+        ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa ${SSHPORT} root@${RELEASE_SERVER_IP} umount $mp)
     done
     SSH_CMD="mkdir -p ${MOUNT_DIR}"
     sshcmd "${SSH_CMD}"
diff --git a/script/step/make_iso_everything.sh b/script/step/make_iso_everything.sh
index 91519c5e813a14c2c82f59a7c12af72c7436149e..fd18c04aef3ba3e0bbc31c02b3f8d46b6741d020 100644
--- a/script/step/make_iso_everything.sh
+++ b/script/step/make_iso_everything.sh
@@ -83,10 +83,10 @@ function make_iso_everything_inchroot()
     sshcmd "${SSH_CMD}"
     sshscp "${TGZ_NAME} ${TGZ_NAME}${SHA256SUM}" "${RELEASE_DIR}"
     set +e
-    ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa root@${RELEASE_SERVER_IP} mount | grep ${RELEASE_VERSION_DIR} | grep everything/${ARCH} | awk '{print $3}')
+    ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa ${SSHPORT} root@${RELEASE_SERVER_IP} mount | grep ${RELEASE_VERSION_DIR} | grep everything/${ARCH} | awk '{print $3}')
     for mp in $ret
     do
-        ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa root@${RELEASE_SERVER_IP} umount $mp)
+        ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa ${SSHPORT} root@${RELEASE_SERVER_IP} umount $mp)
     done
     SSH_CMD="mount -t iso9660 -o loop ${RELEASE_DIR}/${TGZ_NAME} ${MOUNT_DIR}"
     sshcmd "${SSH_CMD}"
diff --git a/script/tools/safe_sshcmd.sh b/script/tools/safe_sshcmd.sh
index 7aea68e1f9345c8d8179e5193a43e26597db071d..e54dad78f49fd936300022789ab94cfc49885bdd 100644
--- a/script/tools/safe_sshcmd.sh
+++ b/script/tools/safe_sshcmd.sh
@@ -4,6 +4,7 @@
 set -e
 execcmd=""
 machineip=""
+machineport=""
 loginuser=root
 loginpassword=huawei
 timeout=120
@@ -17,10 +18,10 @@ retry_cnt=3
 ######################
 function usage()
 {
-    echo "Usage: sshcmd.sh -c "command" -m "machinetip" [-u login_user] [-p login_password] [-t ping_timeout] [-n ssh_retry_time]"
+    echo "Usage: sshcmd.sh -c "command" -m "machinetip" [-P machineport] [-u login_user] [-p login_password] [-t ping_timeout] [-n ssh_retry_time]"
 }
 
-while getopts "c:m:p:u:t:n:h" OPTIONS
+while getopts "c:m:p:u:t:n:P:h" OPTIONS
 do
         case "${OPTIONS}" in
                 c) execcmd="${OPTARG}";;
@@ -29,6 +30,7 @@ do
                 p) loginpassword="${OPTARG}";;
                 t) timeout="${OPTARG}";;
                 n) retry_cnt="${OPTARG}";;
+                P) machineport="${OPTARG}";;
                 \?) echo "ERROR - Invalid parameter"; echo "ERROR - Invalid parameter" >&2;usage;exit 1;;
                 *) echo "ERROR - Invalid parameter"; echo "ERROR - Invalid parameter" >&2; usage;exit 1;;
         esac
@@ -42,7 +44,11 @@ fi
 
 for((i=0;i<retry_cnt;i++))
 do
-    sh "${TOOLS}"/sshcmd.sh -c "${execcmd}" -m "${machineip}" -u "${loginuser}" -p "${loginpassword}"
+    if [ -n "${machineport}" ];then
+        sh "${TOOLS}"/sshcmd.sh -c "${execcmd}" -m "${machineip}" -u "${loginuser}" -p "${loginpassword}" -P "${machineport}"
+    else
+        sh "${TOOLS}"/sshcmd.sh -c "${execcmd}" -m "${machineip}" -u "${loginuser}" -p "${loginpassword}"
+    fi
     if [ $? -ne 0 ];then
         while true
         do
diff --git a/script/tools/sshcmd.sh b/script/tools/sshcmd.sh
index 8ab61678ae1b5688b0cbe665f6468a095ad61a37..d42b3308d2b5d0f761c177fa2807a8b46c81f70b 100644
--- a/script/tools/sshcmd.sh
+++ b/script/tools/sshcmd.sh
@@ -4,6 +4,7 @@
 set -e
 execcmd=""
 machineip=""
+machineport=""
 loginuser=root
 loginpassword=huawei
 
@@ -18,11 +19,15 @@ loginpassword=huawei
 ######################
 function sshcmd_comm()
 {
-	cmd="$1"
+    cmd="$1"
 	testip="$2"
 	password=${3}
-    echo ${password}
 	user=${4-root}
+    if [ $# == 5 ];then
+        testport="$5"
+    else
+        testport=""
+    fi
 	timeout=180
 
 	if [ "$1x" = "x" ]; then
@@ -41,13 +46,17 @@ function sshcmd_comm()
                 echo "isup  time testmathine [password] [user]"
                 exit 1
         fi
+    if [ -n "${testport}" ];then
+        tport="-p ${testport}"
+    else
+        tport=""
+    fi
 	expect <<-END1
 		## set infinite timeout, because some commands maybe execute long time.
 		set timeout -1
 
 		## remotly exectue command
-		spawn ssh -o "ConnectTimeout ${timeout}" -i ~/.ssh/super_publish_rsa "${user}@${testip}" "${cmd}"
-
+		spawn ssh -o "ConnectTimeout ${timeout}" -i ~/.ssh/super_publish_rsa ${tport} "${user}@${testip}" "${cmd}"
 		expect {
 
 			#first connect, no public key in ~/.ssh/known_hosts
@@ -105,13 +114,14 @@ function sshcmd_comm()
 }
 
 
-while getopts "c:m:p:u:h" OPTIONS
+while getopts "c:m:p:u:P:h" OPTIONS
 do
         case "${OPTIONS}" in
                 c) execcmd="${OPTARG}";;
                 m) machineip="${OPTARG}";;
                 u) loginuser="${OPTARG}";;
                 p) loginpassword="${OPTARG}";;
+                P) machineport="${OPTARG}";;
                 \?) echo "ERROR - Invalid parameter"; echo "ERROR - Invalid parameter" >&2;usage;exit 1;;
                 *) echo "ERROR - Invalid parameter"; echo "ERROR - Invalid parameter" >&2; usage;exit 1;;
         esac
@@ -138,7 +148,7 @@ function delete_known_hosts()
 ######################
 function usage()
 {
-        echo "Usage: sshcmd.sh -c "command" -m "machinetip" [-u login_user] [-p login_password]"
+        echo "Usage: sshcmd.sh -c "command" -m "machinetip" [-P machineport] [-u login_user] [-p login_password]"
 }
 
 if [ "x${execcmd}" = "x" -o "x${machineip}" = "x" ];then
@@ -147,6 +157,6 @@ if [ "x${execcmd}" = "x" -o "x${machineip}" = "x" ];then
 fi
 
 delete_known_hosts
-sshcmd_comm "${execcmd}" "${machineip}" "${loginpassword}" "${loginuser}"
+sshcmd_comm "${execcmd}" "${machineip}" "${loginpassword}" "${loginuser}" "${machineport}"
 
 exit $?
diff --git a/script/tools/sshscp.sh b/script/tools/sshscp.sh
index 5fd21068fb8891b1ddbc8ae36f8e673d7f65a99b..7be9432128af425ac2814516032965bc91a05aee 100644
--- a/script/tools/sshscp.sh
+++ b/script/tools/sshscp.sh
@@ -35,13 +35,12 @@ function sshcmd_comm()
 	else
 		r_option=""
 	fi
-
 	expect <<-END1
 		## set infinite timeout, because some commands maybe execute long time.
 		set timeout -1
 
 		## remotly exectue command
-		spawn scp -i ~/.ssh/super_publish_rsa -o "ConnectTimeout ${timeout}" "${r_option}" "${srccommand}" "${descommand}"
+		spawn scp -i ~/.ssh/super_publish_rsa -o "ConnectTimeout ${timeout}" ${SCPPORT} "${r_option}" "${srccommand}" "${descommand}"
 
 		expect {
 
diff --git a/script/tools/util.sh b/script/tools/util.sh
index 476f28be9c937a94542e49e958286f48e2e4a0e3..3b623cab81604d83c95bb4e9a21ff315d39c819c 100644
--- a/script/tools/util.sh
+++ b/script/tools/util.sh
@@ -56,7 +56,11 @@ function log_debug()
 ######################
 function sshcmd()
 {
-    sh "${BUILD_SCRIPT_DIR}/tools/safe_sshcmd.sh" -c "$1" -m "${RELEASE_SERVER_IP}" -t 120 -n 3
+    if [ -n "${RELEASE_SERVER_PORT}" ];then
+        sh "${BUILD_SCRIPT_DIR}/tools/safe_sshcmd.sh" -c "$1" -m "${RELEASE_SERVER_IP}" -t 120 -n 3 -P "${RELEASE_SERVER_PORT}"
+    else
+        sh "${BUILD_SCRIPT_DIR}/tools/safe_sshcmd.sh" -c "$1" -m "${RELEASE_SERVER_IP}" -t 120 -n 3
+    fi
     #sh "${BUILD_SCRIPT_DIR}/tools/safe_sshcmd.sh" -c "$1" -m "${RELEASE_SERVER_IP}" -u "${USER}" -p "${PASSWD}" -t 120 -n 3
 }