Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions jenkins/Build.groovy
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (c) 2026, NVIDIA CORPORATION. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

@Library(['bloom-jenkins-shared-lib@main', 'trtllm-jenkins-shared-lib@main']) _

import groovy.transform.Field
Expand Down Expand Up @@ -164,6 +180,12 @@ def createKubernetesPodConfig(image, type, arch = "amd64")
nodeLabelPrefix = "cpu"
break
}
// Temporarily avoid an arm64 builder with repeated pod DNS/JNLP failures seen in Build-SBSA #5564.
def blockedNodeAffinity = arch == "arm64" ? '''
- key: "kubernetes.io/hostname"
operator: NotIn
values:
- "rl300-0021.ipp2a1.colossus"''' : ""
def nodeLabel = trtllm_utils.generateNodeLabel(nodeLabelPrefix)
def pvcVolume = """
- name: sw-tensorrt-pvc
Expand Down Expand Up @@ -200,6 +222,7 @@ def createKubernetesPodConfig(image, type, arch = "amd64")
values:
- "core"
- "qa_only"
${blockedNodeAffinity}
nodeSelector: ${selectors}
containers:
${containerConfig}
Expand Down
29 changes: 29 additions & 0 deletions jenkins/BuildDockerImage.groovy
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright (c) 2026, NVIDIA CORPORATION. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

@Library(['bloom-jenkins-shared-lib@main', 'trtllm-jenkins-shared-lib@main']) _

import java.lang.Exception
Expand Down Expand Up @@ -92,6 +108,19 @@ def createKubernetesPodConfig(type, arch = "amd64", build_wheel = false)
- "rl300-0046.ipp2u1.colossus"
- "rl300-0047.ipp2u1.colossus"
"""
} else if (arch == "arm64") {
// Temporarily avoid an arm64 builder with repeated pod DNS/JNLP failures seen in Build-SBSA #5564.
selectors += """
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: "kubernetes.io/hostname"
operator: NotIn
values:
- "rl300-0021.ipp2a1.colossus"
"""
}

if (arch == "amd64") {
Expand Down
51 changes: 33 additions & 18 deletions jenkins/L0_Test.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

@Library(['bloom-jenkins-shared-lib@main', 'trtllm-jenkins-shared-lib@main']) _
@Library(['bloom-jenkins-shared-lib@dev-yanchaol-fix-step-log-retry', 'trtllm-jenkins-shared-lib@main']) _

import java.lang.InterruptedException
import groovy.transform.Field
Expand Down Expand Up @@ -941,14 +941,18 @@ def runLLMTestlistWithAgent(pipeline, platform, testList, config=VANILLA_CONFIG,
throw e
}
} finally {
captureSlurmJobNodeList(pipeline, cluster, partition.clusterName, slurmJobID, placementContext, stageName)
stage("Clean Up Slurm Resource") {
// Workaround to handle the interruption during clean up SLURM resources
retry(3) {
try {
cleanUpNodeResources(pipeline, cluster, partition.clusterName, nodeName, slurmJobID)
} catch (Exception e) {
error "Error during clean up SLURM resources: ${e.getMessage()} and retrying."
// Resource cleanup must run even if SLURM metadata capture is interrupted.
try {
captureSlurmJobNodeList(pipeline, cluster, partition.clusterName, slurmJobID, placementContext, stageName)
} finally {
stage("Clean Up Slurm Resource") {
// Workaround to handle the interruption during clean up SLURM resources
retry(3) {
try {
cleanUpNodeResources(pipeline, cluster, partition.clusterName, nodeName, slurmJobID)
} catch (Exception e) {
error "Error during clean up SLURM resources: ${e.getMessage()} and retrying."
}
}
}
}
Expand Down Expand Up @@ -1707,15 +1711,19 @@ def runLLMTestlistWithSbatch(pipeline, platform, testList, config=VANILLA_CONFIG
stageIsInterrupted = true
throw e
} finally {
captureSlurmJobNodeList(pipeline, cluster, partition.clusterName, placementContext?.slurmJobId ?: null, placementContext, stageName, jobWorkspace)
uploadResults(pipeline, cluster, partition.clusterName, jobUID, stageName, stageIsInterrupted, postTag)
stage("Clean Up Slurm Resource") {
// Workaround to handle the interruption during clean up SLURM resources
retry(3) {
try {
cleanUpSlurmResources(pipeline, cluster, partition.clusterName, jobUID)
} catch (Exception e) {
error "Error during clean up SLURM resources: ${e.getMessage()} and retrying."
// Resource cleanup must run even if metadata capture or result upload is interrupted.
try {
captureSlurmJobNodeList(pipeline, cluster, partition.clusterName, placementContext?.slurmJobId ?: null, placementContext, stageName, jobWorkspace)
uploadResults(pipeline, cluster, partition.clusterName, jobUID, stageName, stageIsInterrupted, postTag)
} finally {
stage("Clean Up Slurm Resource") {
// Workaround to handle the interruption during clean up SLURM resources
retry(3) {
try {
cleanUpSlurmResources(pipeline, cluster, partition.clusterName, jobUID)
} catch (Exception e) {
error "Error during clean up SLURM resources: ${e.getMessage()} and retrying."
}
}
}
}
Expand Down Expand Up @@ -2493,6 +2501,12 @@ def createKubernetesPodConfig(image, type, arch = "amd64", gpuCount = 1, perfMod
- SYS_ADMIN"""
break
}
// Temporarily avoid an arm64 CPU builder with repeated pod DNS/JNLP failures seen in Build-SBSA #5564.
def blockedNodeAffinity = targetCloud == "kubernetes-cpu" && arch == "arm64" ? '''
- key: "kubernetes.io/hostname"
operator: NotIn
values:
- "rl300-0021.ipp2a1.colossus"''' : ""
def nodeLabel = trtllm_utils.generateNodeLabel(nodeLabelPrefix)
def pvcVolume = """
- name: sw-tensorrt-pvc
Expand Down Expand Up @@ -2548,6 +2562,7 @@ def createKubernetesPodConfig(image, type, arch = "amd64", gpuCount = 1, perfMod
values:
- "core"
- "qa_only"
${blockedNodeAffinity}
nodeSelector: ${selectors}
containers:
${containerConfig}
Expand Down
Loading