diff --git a/script/step/make_debug_everything.sh b/script/step/make_debug_everything.sh index 642d389580939ddbf99b4af0141c281e3ed76ad0..a95cc9545334b66eb850706ed9ba0659de1d14d4 100644 --- a/script/step/make_debug_everything.sh +++ b/script/step/make_debug_everything.sh @@ -78,7 +78,7 @@ 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 ${SSHPORT} root@${RELEASE_SERVER_IP} mount | grep ${RELEASE_VERSION_DIR} | grep OS/${ARCH} | grep -v test | awk '{print $3}') + ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa ${SSHPORT} root@${RELEASE_SERVER_IP} mount | grep ${RELEASE_VERSION_DIR} | grep debuginfo/${ARCH} | grep -v test | awk '{print $3}') for mp in $ret do ret=$(get_repose ssh -i ~/.ssh/super_publish_rsa ${SSHPORT} root@${RELEASE_SERVER_IP} umount $mp) diff --git a/script/tools/check_iso_mount.sh b/script/tools/check_iso_mount.sh index 2b984210957813c83cf8a58b0b34c1fb1c06b4a4..9ca1f11e7f32321b3bfd76cc80f0aa79e1d25f9f 100644 --- a/script/tools/check_iso_mount.sh +++ b/script/tools/check_iso_mount.sh @@ -82,6 +82,7 @@ function get_iso_list() ip=$3 port=$4 iso_list= + get_repose ssh -i ${key_file} -p ${port} root@${ip} ls ${latest_path} | grep ISO res=$(get_repose ssh -i ${key_file} -p ${port} root@${ip} ls -R ${latest_path}/ISO | grep iso | grep -v sha256sum | grep -v netinst) for iso_path in $res do @@ -105,7 +106,13 @@ release_path=$1 key_file=$2 dailybuild_ip=$3 dailybuild_port=$4 -latest_path=${release_path}/$(get_latest ${release_path} ${key_file} ${dailybuild_ip} ${dailybuild_port}) +target_dir=$5 +if [[ -n "${target_dir}" ]];then + target_dir=${target_dir// /} + latest_path=${release_path}/${target_dir} +else + latest_path=${release_path}/$(get_latest ${release_path} ${key_file} ${dailybuild_ip} ${dailybuild_port}) +fi iso_list=$(get_iso_list ${latest_path} ${key_file} ${dailybuild_ip} ${dailybuild_port}) umount_iso ${latest_path} ${key_file} ${dailybuild_ip} ${dailybuild_port} check_iso_mount "${iso_list}" ${key_file} ${dailybuild_ip} ${dailybuild_port}