From 7cbe30e17d85419a1fabaa8bfdc56f8741a834a3 Mon Sep 17 00:00:00 2001
From: Zhanrui Sun <184402041+ZhanruiSunCh@users.noreply.github.com>
Date: Tue, 5 Aug 2025 16:33:36 +0800
Subject: [PATCH] [TRTLLM-6893][infra] fix Build Docker Image tag issue (#6555)

Signed-off-by: ZhanruiSunCh <184402041+ZhanruiSunCh@users.noreply.github.com>
Signed-off-by: Zhanrui Sun <184402041+ZhanruiSunCh@users.noreply.github.com>
---
 jenkins/BuildDockerImage.groovy | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/jenkins/BuildDockerImage.groovy b/jenkins/BuildDockerImage.groovy
index b09a913525..3fb6c6e4ab 100644
--- a/jenkins/BuildDockerImage.groovy
+++ b/jenkins/BuildDockerImage.groovy
@@ -233,15 +233,11 @@ def buildImage(config, imageKeyToTag)
     def dependentImageWithTag = "${IMAGE_NAME}/${dependent.dockerfileStage}:${dependentTag}"
     def customImageWithTag = "${IMAGE_NAME}/${dockerfileStage}:${customTag}"
 
-    if (target == "ngc-release") {
-        if (TRIGGER_TYPE == "post-merge") {
-            echo "Use NGC artifacts for post merge build"
-            dependentImageWithTag = "${NGC_IMAGE_NAME}:${dependentTag}"
-            imageWithTag = "${NGC_IMAGE_NAME}:${tag}"
-            customImageWithTag = "${NGC_IMAGE_NAME}:${customTag}"
-        }
-        imageKeyToTag["NGC Devel Image ${config.arch}"] = dependentImageWithTag
-        imageKeyToTag["NGC Release Image ${config.arch}"] = imageWithTag
+    if (target == "ngc-release" && TRIGGER_TYPE == "post-merge") {
+        echo "Use NGC artifacts for post merge build"
+        dependentImageWithTag = "${NGC_IMAGE_NAME}:${dependentTag}"
+        imageWithTag = "${NGC_IMAGE_NAME}:${tag}"
+        customImageWithTag = "${NGC_IMAGE_NAME}:${customTag}"
     }
 
     args += " GITHUB_MIRROR=https://urm.nvidia.com/artifactory/github-go-remote"
@@ -630,7 +626,9 @@ pipeline {
                     status = handle.result
 
                     if (status != "SUCCESS") {
-                        error "Downstream job did not succeed"
+                        catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                            error "Downstream job did not succeed"
+                        }
                     }
                 }
             }