Skip to content

Commit 5f3dc08

Browse files
committed
update
Signed-off-by: Chenfei Zhang <[email protected]>
1 parent 5dea124 commit 5f3dc08

File tree

2 files changed

+12
-21
lines changed

2 files changed

+12
-21
lines changed

jenkins/runPerfSanityTriage.groovy

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ def createKubernetesPodConfig(image, arch = "amd64")
2222
apiVersion: v1
2323
kind: Pod
2424
spec:
25-
qosClass: Guaranteed
2625
nodeSelector:
2726
nvidia.com/node_type: builder
2827
kubernetes.io/os: linux
@@ -83,9 +82,9 @@ pipeline {
8382
string(name: "BRANCH", defaultValue: "main", description: "Branch to checkout.")
8483
string(name: "OPEN_SEARCH_PROJECT_NAME", defaultValue: "swdl-trtllm-infra-ci-prod-perf_sanity_info", description: "OpenSearch project name.")
8584
string(name: "OPERATION", defaultValue: "", description: "Operation to perform.")
85+
string(name: "QUERY_JOB_NUMBER", defaultValue: "1", description: "Number of latest jobs to query.")
8686
string(name: "SLACK_CHANNEL_ID", defaultValue: "", description: "Slack channel IDs to send messages to.")
87-
string(name: "SLACK_BOT_TOKEN", defaultValue: "", description: "Slack bot token for authentication.")
88-
string(name: "QUERY_JOB_NUMBER", defaultValue: "", description: "Number of latest jobs to query.")
87+
credentials(name: "SLACK_BOT_TOKEN", defaultValue: "", description: "Slack bot token credential ID for authentication.", credentialType: 'org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl')
8988
}
9089
stages {
9190
stage("Run Perf Sanity Script") {
@@ -96,14 +95,16 @@ pipeline {
9695
sh "env | sort"
9796
trtllm_utils.checkoutSource(LLM_REPO, params.BRANCH, LLM_ROOT, false, false)
9897
sh "pip install slack_sdk"
99-
sh """
100-
cd ${LLM_ROOT}/jenkins/scripts/perf && ls -alh && python3 perf_sanity_triage.py \
101-
--project_name "${params.OPEN_SEARCH_PROJECT_NAME}" \
102-
--operation "${params.OPERATION}" \
103-
--channel_id "${params.SLACK_CHANNEL_ID}" \
104-
--bot_token "${params.SLACK_BOT_TOKEN}" \
105-
--query_job_number "${params.QUERY_JOB_NUMBER}"
106-
"""
98+
withCredentials([string(credentialsId: params.SLACK_BOT_TOKEN, variable: 'SLACK_TOKEN')]) {
99+
sh """
100+
cd ${LLM_ROOT}/jenkins/scripts/perf && ls -alh && python3 perf_sanity_triage.py \
101+
--project_name "${params.OPEN_SEARCH_PROJECT_NAME}" \
102+
--operation "${params.OPERATION}" \
103+
--channel_id "${params.SLACK_CHANNEL_ID}" \
104+
--bot_token "\${SLACK_TOKEN}" \
105+
--query_job_number "${params.QUERY_JOB_NUMBER}"
106+
"""
107+
}
107108
}
108109
}
109110
}

jenkins/scripts/open_search_db.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -251,15 +251,11 @@ def queryFromOpenSearchDB(json_data, project) -> dict:
251251
use_poc_db = "sandbox" in project
252252
if not OPEN_SEARCH_DB_BASE_URL:
253253
OpenSearchDB.logger.info("OPEN_SEARCH_DB_BASE_URL is not set")
254-
print(f"OPEN_SEARCH_DB_BASE_URL is not set")
255254
return None
256255
if not use_poc_db and project not in READ_ACCESS_PROJECT_NAME:
257256
OpenSearchDB.logger.info(
258257
f"project {project} is not in read access project list: {json.dumps(READ_ACCESS_PROJECT_NAME)}"
259258
)
260-
print(
261-
f"project {project} is not in read access project list: {json.dumps(READ_ACCESS_PROJECT_NAME)}"
262-
)
263259
return None
264260
if not isinstance(json_data, str):
265261
json_data_dump = json.dumps(json_data)
@@ -281,16 +277,10 @@ def queryFromOpenSearchDB(json_data, project) -> dict:
281277
OpenSearchDB.logger.info(
282278
f"OpenSearchDB query failed, will retry, error:{res.status_code} {res.text}"
283279
)
284-
print(
285-
f"OpenSearchDB query failed, will retry, error:{res.status_code} {res.text}"
286-
)
287280
retry_time -= 1
288281
OpenSearchDB.logger.info(
289282
f"Fail to queryFromOpenSearchDB after {retry_time} retry: {url}, json: {json_data_dump}, error: {res.text}"
290283
)
291-
print(
292-
f"Fail to queryFromOpenSearchDB after {retry_time} retry: {url}, json: {json_data_dump}, error: {res.text}"
293-
)
294284
return None
295285

296286
@staticmethod

0 commit comments

Comments
 (0)