Skip to content

Commit 3e41e6c

Browse files
yiqingy0chzblych
andauthored
[TRTLLM-6892][infra] Run guardwords scan first in Release Check stage (NVIDIA#6659)
Signed-off-by: Yiqing Yan <yiqingy@nvidia.com> Co-authored-by: Yanchao Lu <yanchaol@nvidia.com>
1 parent 157ea77 commit 3e41e6c

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

jenkins/L0_MergeRequest.groovy

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -386,30 +386,11 @@ def launchReleaseCheck(pipeline)
386386
-y""")
387387
sh "pip3 config set global.break-system-packages true"
388388
sh "git config --global --add safe.directory \"*\""
389-
// Step 1: cloning tekit source code
389+
// Step 1: Clone TRT-LLM source codes
390390
trtllm_utils.checkoutSource(LLM_REPO, env.gitlabCommit, LLM_ROOT, true, true)
391391
sh "cd ${LLM_ROOT} && git config --unset-all core.hooksPath"
392-
trtllm_utils.llmExecStepWithRetry(pipeline, script: "cd ${LLM_ROOT} && python3 -u scripts/release_check.py || (git restore . && false)")
393-
394-
// Step 2: build tools
395-
withEnv(['GONOSUMDB=*.nvidia.com']) {
396-
withCredentials([
397-
gitUsernamePassword(
398-
credentialsId: 'svc_tensorrt_gitlab_read_api_token',
399-
gitToolName: 'git-tool'
400-
),
401-
string(
402-
credentialsId: 'default-git-url',
403-
variable: 'DEFAULT_GIT_URL'
404-
)
405-
]) {
406-
sh "go install ${DEFAULT_GIT_URL}/TensorRT/Infrastructure/licensechecker/cmd/license_checker@v0.3.0"
407-
}
408-
}
409-
// Step 3: Run license check
410-
sh "cd ${LLM_ROOT}/cpp && /go/bin/license_checker -config ../jenkins/license_cpp.json include tensorrt_llm"
411392

412-
// Step 4: Run guardwords scan
393+
// Step 2: Run guardwords scan
413394
def isOfficialPostMergeJob = (env.JOB_NAME ==~ /.*PostMerge.*/)
414395
if (env.alternativeTRT || isOfficialPostMergeJob) {
415396
trtllm_utils.checkoutSource(SCAN_REPO, SCAN_COMMIT, SCAN_ROOT, true, true)
@@ -434,6 +415,26 @@ def launchReleaseCheck(pipeline)
434415
echo "Guardwords Scan Results: https://urm.nvidia.com/artifactory/${UPLOAD_PATH}/guardwords-scan-results/scan.log"
435416
}
436417
}
418+
419+
// Step 3: Run pre-commit checks
420+
trtllm_utils.llmExecStepWithRetry(pipeline, script: "cd ${LLM_ROOT} && python3 -u scripts/release_check.py || (git restore . && false)")
421+
422+
// Step 4: Run license check
423+
withEnv(['GONOSUMDB=*.nvidia.com']) {
424+
withCredentials([
425+
gitUsernamePassword(
426+
credentialsId: 'svc_tensorrt_gitlab_read_api_token',
427+
gitToolName: 'git-tool'
428+
),
429+
string(
430+
credentialsId: 'default-git-url',
431+
variable: 'DEFAULT_GIT_URL'
432+
)
433+
]) {
434+
sh "go install ${DEFAULT_GIT_URL}/TensorRT/Infrastructure/licensechecker/cmd/license_checker@v0.3.0"
435+
}
436+
}
437+
sh "cd ${LLM_ROOT}/cpp && /go/bin/license_checker -config ../jenkins/license_cpp.json include tensorrt_llm"
437438
}
438439

439440
def image = "urm.nvidia.com/docker/golang:1.22"

0 commit comments

Comments
 (0)