Commit 9b63bae9 authored by 袁兴强's avatar 袁兴强

fix ci

parent 05937ef0
...@@ -14,9 +14,10 @@ NOC='\033[0m' ...@@ -14,9 +14,10 @@ NOC='\033[0m'
# 出错退出前拷贝日志文件 # 出错退出前拷贝日志文件
function exit_cp_file() { function exit_cp_file() {
set -x
# shellcheck disable=SC2116 # shellcheck disable=SC2116
# dirNameFa=$(echo ~) dirNameFa=$(echo ~)
dirName="/x2ethereumlogs" dirName="${dirNameFa}/x2ethereumlogs"
if [ ! -d "${dirName}" ]; then if [ ! -d "${dirName}" ]; then
# shellcheck disable=SC2086 # shellcheck disable=SC2086
...@@ -26,18 +27,22 @@ function exit_cp_file() { ...@@ -26,18 +27,22 @@ function exit_cp_file() {
for name in a b c d; do for name in a b c d; do
# shellcheck disable=SC2154 # shellcheck disable=SC2154
docker cp "${dockerNamePrefix}_ebrelayer${name}_1":/root/logs/x2Ethereum_relayer.log "${dirName}/ebrelayer${name}.log" docker cp "${dockerNamePrefix}_ebrelayer${name}_1":/root/logs/x2Ethereum_relayer.log "${dirName}/ebrelayer${name}.log"
docker exec "${dockerNamePrefix}_ebrelayer${name}_1" tail -n 1000 /root/logs/x2Ethereum_relayer.log
done done
docker cp "${dockerNamePrefix}_chain33_1":/root/logs/chain33.log "${dirName}/chain33.log" docker cp "${dockerNamePrefix}_chain33_1":/root/logs/chain33.log "${dirName}/chain33.log"
docker logs "${dockerNamePrefix}_chain33_1" | tail -n 1000
exit 1 exit 1
} }
function copyErrLogs() { function copyErrLogs() {
set -x
if [ -n "$CASE_ERR" ]; then if [ -n "$CASE_ERR" ]; then
# /var/lib/jenkins # /var/lib/jenkins
# shellcheck disable=SC2116 # shellcheck disable=SC2116
# dirNameFa=$(echo ~) dirNameFa=$(echo ~)
dirName="/x2ethereumlogs" dirName="${dirNameFa}/x2ethereumlogs"
if [ ! -d "${dirName}" ]; then if [ ! -d "${dirName}" ]; then
# shellcheck disable=SC2086 # shellcheck disable=SC2086
...@@ -47,8 +52,10 @@ function copyErrLogs() { ...@@ -47,8 +52,10 @@ function copyErrLogs() {
for name in a b c d; do for name in a b c d; do
# shellcheck disable=SC2154 # shellcheck disable=SC2154
docker cp "${dockerNamePrefix}_ebrelayer${name}_rpc_1":/root/logs/x2Ethereum_relayer.log "${dirName}/ebrelayer${name}_rpc.log" docker cp "${dockerNamePrefix}_ebrelayer${name}_rpc_1":/root/logs/x2Ethereum_relayer.log "${dirName}/ebrelayer${name}_rpc.log"
docker exec "${dockerNamePrefix}_ebrelayer${name}_rpc_1" tail -n 1000 /root/logs/x2Ethereum_relayer.log
done done
docker cp "${dockerNamePrefix}_chain33_1":/root/logs/chain33.log "${dirName}/chain33_rpc.log" docker cp "${dockerNamePrefix}_chain33_1":/root/logs/chain33.log "${dirName}/chain33_rpc.log"
docker logs "${dockerNamePrefix}_chain33_1" | tail -n 1000
fi fi
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment