Skip to content

[fix](ci) rm some infos #63228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hello-stephen merged 4 commits into from
Jun 8, 2026
+15 −2
Merged

[fix](ci) rm some infos #63228

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
433c4e8
[fix](ci) rm some infos
hello-stephen May 13, 2026
c5d1bbf
[fix](ci) build cred redaction sed expr only from non-empty vars
hello-stephen Jun 5, 2026
f537326
[fix](ci) escape sed metacharacters in credential values before redac…
hello-stephen Jun 5, 2026
d9d52ad
Merge branch 'master' into 0513-ci
hello-stephen Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions regression-test/pipeline/common/doris-utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,17 @@ _monitor_regression_log() {

}

_redact_creds() {
local expr="" v escaped
for v in "${hwYunAk:-}" "${hwYunSk:-}" "${s3SourceAk:-}" "${s3SourceSk:-}" "${txYunAk:-}" "${txYunSk:-}"; do
if [[ -n "${v}" ]]; then
escaped=$(printf '%s' "${v}" | sed 's/[]\/$*.^[]/\\&/g')
expr+="s/${escaped}//g;"
fi
done
[[ -n "${expr}" ]] && sed -i "${expr}" "$@" &>/dev/null || true
}

archive_doris_logs() {
if [[ ! -d "${DORIS_HOME:-}" ]]; then return 1; fi
local archive_name="$1"
Expand All @@ -674,17 +685,19 @@ archive_doris_logs() {
(
cd "${DORIS_HOME}" || return 1
cp --parents -rf "fe/conf" "${archive_dir}"/
_redact_creds fe/log/*
cp --parents -rf "fe/log" "${archive_dir}"/
cp --parents -rf "be/conf" "${archive_dir}"/
_redact_creds be/log/*
cp --parents -rf "be/log" "${archive_dir}"/
if [[ -d "${DORIS_HOME}"/regression-test/log ]]; then
# try to hide ak and sk
if sed -i "s/${cos_ak:-}//g;s/${cos_sk:-}//g" regression-test/log/* &>/dev/null; then :; fi
_redact_creds regression-test/log/*
cp --parents -rf "regression-test/log" "${archive_dir}"/
fi
if [[ -d "${DORIS_HOME}"/../regression-test/conf ]]; then
# try to hide ak and sk
if sed -i "s/${cos_ak:-}//g;s/${cos_sk:-}//g" ../regression-test/conf/* &>/dev/null; then :; fi
_redact_creds ../regression-test/conf/*
mkdir -p "${archive_dir}"/regression-test/conf
cp -rf ../regression-test/conf/* "${archive_dir}"/regression-test/conf/
fi
Expand Down
Loading