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 1 commit
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
6 changes: 4 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 @@ -674,17 +674,19 @@ archive_doris_logs() {
(
cd "${DORIS_HOME}" || return 1
cp --parents -rf "fe/conf" "${archive_dir}"/
if sed -i "s/${hwYunAk:-}//g;s/${hwYunSk:-}//g;s/${s3SourceAk:-}//g;s/${s3SourceSk:-}//g;s/${txYunAk:-}//g;s/${txYunSk:-}//g" fe/log/* &>/dev/null; then :; fi

@github-actions github-actions Bot Jun 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This redaction can be skipped in normal cloud/vault runs when the optional Huawei credentials are unset. cloud_p0/run.sh and vault_p0/run.sh require s3SourceAk/s3SourceSk but only warn for missing hwYunAk/hwYunSk; with hwYunAk empty this expands to an invalid leading sed expression (s//g...), sed exits before processing the later required S3 credentials, and the failure is suppressed by &>/dev/null, so the archive can still contain s3SourceAk/s3SourceSk. Please build the redaction script only from non-empty values (and apply the same fix to the duplicated BE/regression/conf redaction lines) instead of interpolating empty variables directly.

cp --parents -rf "fe/log" "${archive_dir}"/
cp --parents -rf "be/conf" "${archive_dir}"/
if sed -i "s/${hwYunAk:-}//g;s/${hwYunSk:-}//g;s/${s3SourceAk:-}//g;s/${s3SourceSk:-}//g;s/${txYunAk:-}//g;s/${txYunSk:-}//g" be/log/* &>/dev/null; then :; fi
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
if sed -i "s/${hwYunAk:-}//g;s/${hwYunSk:-}//g;s/${s3SourceAk:-}//g;s/${s3SourceSk:-}//g;s/${txYunAk:-}//g;s/${txYunSk:-}//g" regression-test/log/* &>/dev/null; then :; fi
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
if sed -i "s/${hwYunAk:-}//g;s/${hwYunSk:-}//g;s/${s3SourceAk:-}//g;s/${s3SourceSk:-}//g;s/${txYunAk:-}//g;s/${txYunSk:-}//g" ../regression-test/conf/* &>/dev/null; then :; fi
mkdir -p "${archive_dir}"/regression-test/conf
cp -rf ../regression-test/conf/* "${archive_dir}"/regression-test/conf/
fi
Expand Down
Loading