Skip to content

Commit 9e05613

Browse files
authored
[Infra] - Update JNLP container config (#5008)
Signed-off-by: Yanchao Lu <[email protected]>
1 parent 786e32d commit 9e05613

File tree

6 files changed

+23
-7
lines changed

6 files changed

+23
-7
lines changed

jenkins/Build.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ def createKubernetesPodConfig(image, type, arch = "amd64")
142142
def jobName = getShortenedJobName(env.JOB_NAME)
143143
def buildID = env.BUILD_ID
144144

145+
def archSuffix = arch == "arm64" ? "arm" : "amd"
146+
def jnlpImage = "urm.nvidia.com/sw-ipp-blossom-sre-docker-local/lambda/custom_jnlp_images_${archSuffix}_linux:jdk17"
147+
145148
switch(type)
146149
{
147150
case "build":
@@ -229,7 +232,7 @@ def createKubernetesPodConfig(image, type, arch = "amd64")
229232
fieldRef:
230233
fieldPath: spec.nodeName
231234
- name: jnlp
232-
image: urm.nvidia.com/docker/jenkins/inbound-agent:4.13.3-1
235+
image: ${jnlpImage}
233236
args: ['\$(JENKINS_SECRET)', '\$(JENKINS_NAME)']
234237
resources:
235238
requests:

jenkins/BuildDockerImage.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ def createKubernetesPodConfig(type, arch = "amd64", build_wheel = false)
7979
"""
8080
}
8181

82+
def archSuffix = arch == "arm64" ? "arm" : "amd"
83+
def jnlpImage = "urm.nvidia.com/sw-ipp-blossom-sre-docker-local/lambda/custom_jnlp_images_${archSuffix}_linux:jdk17"
84+
8285
switch(type)
8386
{
8487
case "agent":
@@ -152,7 +155,7 @@ def createKubernetesPodConfig(type, arch = "amd64", build_wheel = false)
152155
containers:
153156
${containerConfig}
154157
- name: jnlp
155-
image: urm.nvidia.com/docker/jenkins/inbound-agent:4.13.3-1
158+
image: ${jnlpImage}
156159
args: ['\$(JENKINS_SECRET)', '\$(JENKINS_NAME)']
157160
resources:
158161
requests:

jenkins/L0_MergeRequest.groovy

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ String getShortenedJobName(String path)
175175
return parts.join('-').toLowerCase()
176176
}
177177

178-
def createKubernetesPodConfig(image, type)
178+
def createKubernetesPodConfig(image, type, arch = "amd64")
179179
{
180180
def targetCould = "kubernetes-cpu"
181181
def selectors = """
@@ -186,6 +186,9 @@ def createKubernetesPodConfig(image, type)
186186
def jobName = getShortenedJobName(env.JOB_NAME)
187187
def buildID = env.BUILD_ID
188188

189+
def archSuffix = arch == "arm64" ? "arm" : "amd"
190+
def jnlpImage = "urm.nvidia.com/sw-ipp-blossom-sre-docker-local/lambda/custom_jnlp_images_${archSuffix}_linux:jdk17"
191+
189192
switch(type)
190193
{
191194
case "agent":
@@ -277,7 +280,7 @@ def createKubernetesPodConfig(image, type)
277280
fieldRef:
278281
fieldPath: spec.nodeName
279282
- name: jnlp
280-
image: urm.nvidia.com/docker/jenkins/inbound-agent:4.13.3-1
283+
image: ${jnlpImage}
281284
args: ['\$(JENKINS_SECRET)', '\$(JENKINS_NAME)']
282285
resources:
283286
requests:

jenkins/L0_Test.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,9 @@ def createKubernetesPodConfig(image, type, arch = "amd64", gpuCount = 1, perfMod
364364
def jobName = getShortenedJobName(env.JOB_NAME)
365365
def buildID = env.BUILD_ID
366366

367+
def archSuffix = arch == "arm64" ? "arm" : "amd"
368+
def jnlpImage = "urm.nvidia.com/sw-ipp-blossom-sre-docker-local/lambda/custom_jnlp_images_${archSuffix}_linux:jdk17"
369+
367370
switch(type)
368371
{
369372
case "agent":
@@ -546,7 +549,7 @@ def createKubernetesPodConfig(image, type, arch = "amd64", gpuCount = 1, perfMod
546549
fieldRef:
547550
fieldPath: spec.nodeName
548551
- name: jnlp
549-
image: urm.nvidia.com/docker/jenkins/inbound-agent:4.13.3-1
552+
image: ${jnlpImage}
550553
args: ['\$(JENKINS_SECRET)', '\$(JENKINS_NAME)']
551554
resources:
552555
requests:

jenkins/controlCCache.groovy

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ import java.lang.InterruptedException
33

44
DOCKER_IMAGE = "urm.nvidia.com/sw-tensorrt-docker/tensorrt-llm:pytorch-25.04-py3-x86_64-ubuntu24.04-trt10.10.0.31-skip-tritondevel-202506021004-9420"
55

6-
def createKubernetesPodConfig(image)
6+
def createKubernetesPodConfig(image, arch = "amd64")
77
{
8+
def archSuffix = arch == "arm64" ? "arm" : "amd"
9+
def jnlpImage = "urm.nvidia.com/sw-ipp-blossom-sre-docker-local/lambda/custom_jnlp_images_${archSuffix}_linux:jdk17"
10+
811
def podConfig = [
912
cloud: "kubernetes-cpu",
1013
namespace: "sw-tensorrt",
@@ -39,7 +42,7 @@ def createKubernetesPodConfig(image)
3942
ephemeral-storage: 25Gi
4043
imagePullPolicy: Always
4144
- name: jnlp
42-
image: urm.nvidia.com/docker/jenkins/inbound-agent:4.13.3-1
45+
image: ${jnlpImage}
4346
args: ['\$(JENKINS_SECRET)', '\$(JENKINS_NAME)']
4447
resources:
4548
requests:

tests/integration/test_lists/test-db/l0_gh200.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ l0_gh200:
3333
gpu:
3434
- '*h200*'
3535
linux_distribution_name: ubuntu*
36+
cpu: aarch64
3637
terms:
3738
stage: post_merge
3839
backend: tensorrt

0 commit comments

Comments
 (0)