Skip to content

Commit 2d32452

Browse files
authored
[None][infra] Fix plc nightly pipeline and show more data (NVIDIA#12940)
Signed-off-by: Yuanjing Xue <197832395+yuanjingx87@users.noreply.github.com>
1 parent 4ba9f67 commit 2d32452

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

jenkins/TensorRT_LLM_PLC.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ def pulseScanContainer(llmRepo, branchName) {
229229
script: "python3 ./jenkins/scripts/get_image_key_to_tag.py ${params.branchName}",
230230
returnStdout: true
231231
).trim()
232-
println(output)
232+
println("Container image key-to-tag mapping for branch '${params.branchName}':\n${output}")
233233
def containerTagMap = new JsonSlurper().parseText(output)
234234
imageTags["release_amd64"] = [image: containerTagMap["NGC Release Image amd64"], platform: "linux/amd64"]
235235
imageTags["release_arm64"] = [image: containerTagMap["NGC Release Image arm64"], platform: "linux/arm64"]

jenkins/scripts/pulse_in_pipeline_scanning/submit_report.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
sys.path.append(os.path.abspath(".."))
99
from utils.common import load_json
1010
from utils.es import es_post
11-
from utils.report import diff_licenses, diff_vulns
11+
from utils.report import diff_licenses, get_vulns
1212

1313
ES_POST_URL = os.environ.get("TRTLLM_ES_POST_URL")
1414
if not ES_POST_URL:
@@ -148,7 +148,7 @@ def submit_container_vulns(
148148
):
149149
release_data = load_json(input_file)
150150
base_data = load_json(base_input_file)
151-
trtllm_deps = diff_vulns(input_file)
151+
trtllm_deps = get_vulns(input_file)
152152

153153
docs = []
154154
new_items = []
@@ -172,7 +172,9 @@ def submit_container_vulns(
172172
"s_severity": v.get("severity"),
173173
"s_package_name": package_name,
174174
"s_package_version": package_version,
175+
"s_package_fix_version": v.get("fix") or "N/A",
175176
"s_cve": v.get("vuln"),
177+
"s_cve_url": v.get("url"),
176178
"s_package_paths": ",".join(v.get("package_paths", [])),
177179
"b_is_new": is_new,
178180
}
@@ -208,8 +210,8 @@ def submit_container_licenses(
208210
release_image = release_data.get("image_tag", "")
209211
base_image = base_data.get("image_tag", "")
210212
for v in trtllm_deps:
211-
package_name = v.get("package_name")
212-
package_version = v.get("package_version")
213+
package_name = v.get("package")
214+
package_version = v.get("version")
213215
result_key = (package_name, package_version)
214216
is_new = result_key not in last_scan_result
215217
doc = {

jenkins/scripts/pulse_in_pipeline_scanning/utils/report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def dedup_licenses(contents):
3232
return seen
3333

3434

35-
def diff_vulns(release_path):
35+
def get_vulns(release_path):
3636
release_data = load_json(release_path)
3737

3838
release_vulns = dedup_vulns(release_data["vulnerabilities"])

0 commit comments

Comments
 (0)