Skip to content

Commit 9f45e80

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

File tree

5 files changed

+22
-7
lines changed

5 files changed

+22
-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.11-1-jdk11
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
@@ -24,6 +24,9 @@ def createKubernetesPodConfig(type, arch = "amd64")
2424
def targetCould = "kubernetes-cpu"
2525
def containerConfig = ""
2626

27+
def archSuffix = arch == "arm64" ? "arm" : "amd"
28+
def jnlpImage = "urm.nvidia.com/sw-ipp-blossom-sre-docker-local/lambda/custom_jnlp_images_${archSuffix}_linux:jdk17"
29+
2730
switch(type)
2831
{
2932
case "agent":
@@ -81,7 +84,7 @@ def createKubernetesPodConfig(type, arch = "amd64")
8184
containers:
8285
${containerConfig}
8386
- name: jnlp
84-
image: urm.nvidia.com/docker/jenkins/inbound-agent:4.11-1-jdk11
87+
image: ${jnlpImage}
8588
args: ['\$(JENKINS_SECRET)', '\$(JENKINS_NAME)']
8689
resources:
8790
requests:

jenkins/L0_MergeRequest.groovy

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ String getShortenedJobName(String path)
168168
return parts.join('-').toLowerCase()
169169
}
170170

171-
def createKubernetesPodConfig(image, type)
171+
def createKubernetesPodConfig(image, type, arch = "amd64")
172172
{
173173
def targetCould = "kubernetes-cpu"
174174
def selectors = """
@@ -179,6 +179,9 @@ def createKubernetesPodConfig(image, type)
179179
def jobName = getShortenedJobName(env.JOB_NAME)
180180
def buildID = env.BUILD_ID
181181

182+
def archSuffix = arch == "arm64" ? "arm" : "amd"
183+
def jnlpImage = "urm.nvidia.com/sw-ipp-blossom-sre-docker-local/lambda/custom_jnlp_images_${archSuffix}_linux:jdk17"
184+
182185
switch(type)
183186
{
184187
case "agent":
@@ -270,7 +273,7 @@ def createKubernetesPodConfig(image, type)
270273
fieldRef:
271274
fieldPath: spec.nodeName
272275
- name: jnlp
273-
image: urm.nvidia.com/docker/jenkins/inbound-agent:4.11-1-jdk11
276+
image: ${jnlpImage}
274277
args: ['\$(JENKINS_SECRET)', '\$(JENKINS_NAME)']
275278
resources:
276279
requests:

jenkins/L0_Test.groovy

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

363+
def archSuffix = arch == "arm64" ? "arm" : "amd"
364+
def jnlpImage = "urm.nvidia.com/sw-ipp-blossom-sre-docker-local/lambda/custom_jnlp_images_${archSuffix}_linux:jdk17"
365+
363366
switch(type)
364367
{
365368
case "agent":
@@ -524,7 +527,7 @@ def createKubernetesPodConfig(image, type, arch = "amd64", gpuCount = 1, perfMod
524527
fieldRef:
525528
fieldPath: spec.nodeName
526529
- name: jnlp
527-
image: urm.nvidia.com/docker/jenkins/inbound-agent:4.11-1-jdk11
530+
image: ${jnlpImage}
528531
args: ['\$(JENKINS_SECRET)', '\$(JENKINS_NAME)']
529532
resources:
530533
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-202505292346-4931"
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.11-1-jdk11
45+
image: ${jnlpImage}
4346
args: ['\$(JENKINS_SECRET)', '\$(JENKINS_NAME)']
4447
resources:
4548
requests:

0 commit comments

Comments
 (0)