diff --git a/script/config/config_temp b/script/config/config_temp index 3a8d8a38b6f25279286f6939c54bb58b0c1fa21f..45bfd4e29ee436cf2cef6f3e18aea93c116288dc 100644 --- a/script/config/config_temp +++ b/script/config/config_temp @@ -8,8 +8,8 @@ ARCH="ARM64" TIME="" ####RELEASE########## -RELEASE_USER="root" -RELEASE_PASSWD="$dogshengpwd82" +RELEASE_USER="" +RELEASE_PASSWD="" CI_PROJECT="openeuler_ARM64" HTTP_RELEASE_DIR="http://${RELEASE_IP}/internal_use_only/EulerOS/${VERSION_C}/${CI_PROJECT}" @@ -19,9 +19,9 @@ RELEASE_CONFIG_FILE="${SSH_RELEASE_DIR}/config_${PRODUCT}" ############################for pxe##################### -PXE_SERVER_IP="10.175.124.178" -PXE_SERVER_USER="root" -PXE_SERVER_PASSWD="huawei1abc" +PXE_SERVER_IP="" +PXE_SERVER_USER="" +PXE_SERVER_PASSWD="" pxe_tftpboot="/tftpboot" pxe_config_dir="${pxe_tftpboot}/pxelinux.cfg" pxe_boot_dir="${pxe_tftpboot}/boot_image/${VERSION_C}/${PRODUCT}/${ARCH}/${VERSION_B}" diff --git a/script/internal.sh b/script/internal.sh index 46eba034debdd6ef73751accc0ca5fa04e9323ac..16d72b818af233d0dc2febbb0895e703d84734ba 100644 --- a/script/internal.sh +++ b/script/internal.sh @@ -19,9 +19,8 @@ export WORK_DIR="${OUTPUT_PATH}/work_dir/${CI_PROJECT}/" set +ue export RELEASE_ROOT_PATH=${RELEASE_ROOT_PATH} if [ "x${jenkins_build}" != "x" ]; then - export USER="root" - export PASSWD="${dogshengpwd81}" - echo $dogshengpwd81 > /home/pwd.list + export USER="" + export PASSWD="" export HTTP_DIR=${RELEASE_ROOT_PATH} export PRE_VERSION=${RELEASE_VERSION_DIR} else @@ -40,8 +39,8 @@ export OPENEULER_CHROOT_PATH="/usr1/openeuler" export ICP_CI_IP="" export MOUNTDIR_MASTER="" export MOUNTDIR_AGENT="" -export MASTER_USER="Administrator" -export MASTER_PASSWD="openeuler_123" +export MASTER_USER="" +export MASTER_PASSWD="" #for gerrit export GERRIT_BRANCH="next" diff --git a/script/step/make_vm_qcow2.sh b/script/step/make_vm_qcow2.sh index 12f554f88adce5d67cf3757a77be59c19c6b1224..6b6df2012188f81d2d303584c858dedb00f17b91 100644 --- a/script/step/make_vm_qcow2.sh +++ b/script/step/make_vm_qcow2.sh @@ -23,9 +23,9 @@ function make_vm_qcow2() ###################### function make_vm_qcow2_inchroot() { - remoteip=10.175.112.72 - remoteroot=root - remotepwd=EulerLinux + remoteip="" + remoteroot="" + remotepwd="" qcow2_image_dir=qcow2_image basedir=/home/V3R1/arm64_make_qcow2/arm64_standard remote_img_dir="${basedir}/qcow2_image" diff --git a/script/tools/safe_sshcmd.sh b/script/tools/safe_sshcmd.sh index 7aea68e1f9345c8d8179e5193a43e26597db071d..502f7ac62ff64c1e27630bc67f7635c7265b1972 100644 --- a/script/tools/safe_sshcmd.sh +++ b/script/tools/safe_sshcmd.sh @@ -4,8 +4,8 @@ set -e execcmd="" machineip="" -loginuser=root -loginpassword=huawei +loginuser="" +loginpassword="" timeout=120 retry_cnt=3 diff --git a/script/tools/safe_sshscp.sh b/script/tools/safe_sshscp.sh index 07bc82f203bb5a3caf443e2ad348aa041f45aab0..34ccc53b9095a026972ada15705ed7be24287a75 100644 --- a/script/tools/safe_sshscp.sh +++ b/script/tools/safe_sshscp.sh @@ -4,8 +4,8 @@ set -e src="" des="" -loginuser="root" -loginpassword="kong" +loginuser="" +loginpassword="" r_option=0 timeout=120 retry_cnt=3 diff --git a/script/tools/sshcmd.sh b/script/tools/sshcmd.sh index b09c05f91ba16215c70bd4c1a3845415f46712b2..af7c597be74bc23d01a318cc967bb05ffa05c103 100644 --- a/script/tools/sshcmd.sh +++ b/script/tools/sshcmd.sh @@ -4,8 +4,8 @@ set -e execcmd="" machineip="" -loginuser=root -loginpassword=huawei +loginuser="" +loginpassword="" ###################### @@ -21,8 +21,7 @@ function sshcmd_comm() cmd="$1" testip="$2" password=${3} - echo ${password} - user=${4-root} + user=${4} timeout=180 if [ "$1x" = "x" ]; then diff --git a/script/tools/sshscp.sh b/script/tools/sshscp.sh index 21da46eebb182bf80796e9666b663672dad8ae34..21ba43912005cb3d6ffe95f9dae93b369928647b 100644 --- a/script/tools/sshscp.sh +++ b/script/tools/sshscp.sh @@ -17,7 +17,7 @@ function sshcmd_comm() srccommand="$1" descommand="$2" - password=${3-huawei} + password=${3} local r_option="$4" timeout=180 if [ "$1x" = "x" ]; then @@ -150,8 +150,8 @@ function usage() src="" des="" -loginuser="root" -loginpassword="huawei" +loginuser="" +loginpassword="" while getopts "p:s:d:hr" OPTIONS do