Skip to content

[Infra][TRTLLM-5633] - Fix merge waive list #6504

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
merged 4 commits into from
Jul 31, 2025
Merged

[Infra][TRTLLM-5633] - Fix merge waive list #6504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27f9af7
write diff to the file
yiqingy0 Jul 31, 2025
582e24d
test
yiqingy0 Jul 31, 2025
064350d
fix pre-commit check
yiqingy0 Jul 31, 2025
ba1fc1d
revert test
yiqingy0 Jul 31, 2025
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
5 changes: 4 additions & 1 deletion jenkins/L0_MergeRequest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,12 +347,15 @@ def mergeWaiveList(pipeline, globalVars)
// Get waive list diff in current MR
def diff = getMergeRequestOneFileChanges(pipeline, globalVars, "tests/integration/test_lists/waives.txt")

// Write diff to a temporary file to avoid shell escaping issues
writeFile file: 'diff_content.txt', text: diff

// Merge waive lists
sh """
python3 mergeWaiveList.py \
--cur-waive-list=waives_CUR_${env.gitlabCommit}.txt \
--latest-waive-list=waives_TOT_${targetBranchTOTCommit}.txt \
--diff='${diff}' \
--diff-file=diff_content.txt \
--output-file=waives.txt
"""
trtllm_utils.uploadArtifacts("waives*.txt", "${UPLOAD_PATH}/waive_list/")
Expand Down
10 changes: 7 additions & 3 deletions jenkins/scripts/mergeWaiveList.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
# 3. Merge the current MR waive list and TOT waive list, and remove the removed lines from the step 1


def get_remove_lines_from_diff(diff):
def get_remove_lines_from_diff_file(diff_file):
with open(diff_file, 'r') as f:
diff = f.read()
lines = diff.split('\n')
remove_lines = [
line[1:] + '\n' for line in lines
Expand Down Expand Up @@ -47,10 +49,12 @@ def merge_waive_list(cur_list, main_list, remove_lines, output_file):
parser.add_argument('--latest-waive-list',
required=True,
help='Latest waive list')
parser.add_argument('--diff', required=True, help='Diff of the waive list')
parser.add_argument('--diff-file',
required=True,
help='File containing diff of the waive list')
parser.add_argument('--output-file', required=True, help='Output file')
args = parser.parse_args(sys.argv[1:])
cur_list = parse_waive_txt(args.cur_waive_list)
main_list = parse_waive_txt(args.latest_waive_list)
remove_lines = get_remove_lines_from_diff(args.diff)
remove_lines = get_remove_lines_from_diff_file(args.diff_file)
merge_waive_list(cur_list, main_list, remove_lines, args.output_file)