Skip to content
Merged
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
37 changes: 21 additions & 16 deletions jenkins/L0_MergeRequest.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -931,9 +931,18 @@ def launchReleaseCheck(pipeline, globalVars)
})
}

// Inside a parallel branch, pass a nested stage name: Blue Ocean shows a skip marked on the branch's own stage as NOT_BUILT.
def skipStage(String stageName, String message)
{
stage(stageName) {
echo message
jUtils.markStageSkippedForConditional(stageName)
Comment thread
EmmaQiaoCh marked this conversation as resolved.
Resolved
}
}

def launchTestListCheck(pipeline, globalVars)
{
def key = "Check Test List"
def key = "Check-Test-List"
def image = globalVars["LLM_DOCKER_IMAGE"]
trtllm_utils.launchKubernetesPod(pipeline, createKubernetesPodConfig(image, "package"), "trt-llm", {
stage("[${key}] Run") {
Expand Down Expand Up @@ -2557,22 +2566,22 @@ def launchStages(pipeline, reuseBuild, testFilter, enableFailFast, globalVars)
launchReleaseCheck(this, globalVars)
}
},
"Check Test List": {
"Check-Test-List": {
script {
if (testFilter[INFRA_DRY_RUN]) {
echo "Skipping Check Test List for the infrastructure dry run."
skipStage("[Check-Test-List] Run", "Skipping Check Test List for the infrastructure dry run.")
return
} else if (GEN_POST_MERGE_BUILDS_ONLY) {
echo "Skipping Check Test List (GenPostMergeBuilds mode: builds only)"
skipStage("[Check-Test-List] Run", "Skipping Check Test List (GenPostMergeBuilds mode: builds only)")
return
} else if (runMode == "nightly_release") {
echo "Skipping Check Test List for nightly_release."
skipStage("[Check-Test-List] Run", "Skipping Check Test List for nightly_release.")
return
} else if (testFilter[(ONLY_ONE_GROUP_CHANGED)] == "Docs") {
echo "Skipping Check Test List for Docs-only changes."
skipStage("[Check-Test-List] Run", "Skipping Check Test List for Docs-only changes.")
return
} else if (env.JOB_NAME ==~ /.*BuildDockerImageSanityTest.*/) {
echo "Skipping Check Test List for BuildDockerImageSanityTest."
skipStage("[Check-Test-List] Run", "Skipping Check Test List for BuildDockerImageSanityTest.")
return
}
launchTestListCheck(this, globalVars)
Expand Down Expand Up @@ -3235,7 +3244,7 @@ def launchStages(pipeline, reuseBuild, testFilter, enableFailFast, globalVars)
stages += dockerBuildJob
}

def alwaysFailFastStages = ["Release-Check", "Check Test List"] as Set
def alwaysFailFastStages = ["Release-Check", "Check-Test-List"] as Set
parallelJobs = stages.collectEntries{key, value -> [key, {
script {
stage(key) {
Expand Down Expand Up @@ -3342,16 +3351,12 @@ pipeline {
}
}
},
"Check Test List": {
stage("Check Test List") {
"Check-Test-List": {
stage("Check-Test-List") {
if (testFilter[INFRA_DRY_RUN]) {
echo "Skipping Check Test List for the infrastructure dry run."
} else if (runMode == "nightly_release") {
echo "Skipping Check Test List for nightly_release."
skipStage("[Check-Test-List] Run", "Skipping Check Test List for the infrastructure dry run.")
} else if (testFilter[(ONLY_ONE_GROUP_CHANGED)] == "Docs") {
echo "Skipping Check Test List for Docs-only changes."
} else if (env.JOB_NAME ==~ /.*BuildDockerImageSanityTest.*/) {
echo "Skipping Check Test List for BuildDockerImageSanityTest."
skipStage("[Check-Test-List] Run", "Skipping Check Test List for Docs-only changes.")
} else {
launchTestListCheck(this, globalVars)
}
Expand Down
Loading