From 53fd88eb5f58fb4bed3df5d315dd8279df548877 Mon Sep 17 00:00:00 2001 From: Peixin Li Date: Tue, 2 Jun 2026 09:31:15 +0800 Subject: [PATCH 1/4] Use debug bundle upload in premerge CI Signed-off-by: Peixin Li --- ci/Jenkinsfile.premerge | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ci/Jenkinsfile.premerge b/ci/Jenkinsfile.premerge index 2c5d274e..35dd710d 100644 --- a/ci/Jenkinsfile.premerge +++ b/ci/Jenkinsfile.premerge @@ -68,7 +68,6 @@ pipeline { ART_CREDS = credentials("urm_creds") ARTIFACTORY_NAME = "${common.ARTIFACTORY_NAME}" - PVC = credentials("pvc") CUSTOM_WORKSPACE = "/home/jenkins/agent/workspace/${BUILD_TAG}" } @@ -112,7 +111,6 @@ pipeline { label "premerge-docker-${BUILD_TAG}" cloud "${common.CLOUD_NAME}" yaml pod.getDockerBuildYAML() - workspaceVolume persistentVolumeClaimWorkspaceVolume(claimName: "${PVC}", readOnly: false) customWorkspace "${CUSTOM_WORKSPACE}" } } @@ -174,7 +172,6 @@ pipeline { label "premerge-ci-${BUILD_TAG}" cloud "${common.CLOUD_NAME}" yaml pod.getGPUYAML("${IMAGE_PREMERGE}", "${env.GPU_RESOURCE}", '8', '32Gi') - workspaceVolume persistentVolumeClaimWorkspaceVolume(claimName: "${PVC}", readOnly: false) customWorkspace "${CUSTOM_WORKSPACE}" } } @@ -184,8 +181,13 @@ pipeline { githubHelper.updateCommitStatus("", "Running - tests", GitHubCommitState.PENDING) container('gpu') { timeout(time: 2, unit: 'HOURS') { // step only timeout for test run - common.resolveIncompatibleDriverIssue(this) - sh 'bash ci/test.sh pre-merge' + try { + common.resolveIncompatibleDriverIssue(this) + sh 'bash ci/test.sh pre-merge' + } catch (e) { + common.uploadDebugBundle(this, 'spark-rapids-ml', 'premerge') + throw e + } } } } From 37cfae93354fbf24fcd95ddd66c8c23a0ef04bc2 Mon Sep 17 00:00:00 2001 From: Peixin Li Date: Tue, 2 Jun 2026 09:42:58 +0800 Subject: [PATCH 2/4] TEMP: Force premerge debug bundle upload Signed-off-by: Peixin Li --- ci/Jenkinsfile.premerge | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/Jenkinsfile.premerge b/ci/Jenkinsfile.premerge index 35dd710d..bcf9e7f1 100644 --- a/ci/Jenkinsfile.premerge +++ b/ci/Jenkinsfile.premerge @@ -184,6 +184,7 @@ pipeline { try { common.resolveIncompatibleDriverIssue(this) sh 'bash ci/test.sh pre-merge' + error('TEMPORARY: fail after regular test run to validate debug bundle upload') } catch (e) { common.uploadDebugBundle(this, 'spark-rapids-ml', 'premerge') throw e From 3ba8af7eaee9ad1ed55abf019c28105d2137349e Mon Sep 17 00:00:00 2001 From: Peixin Li Date: Tue, 2 Jun 2026 09:57:01 +0800 Subject: [PATCH 3/4] Restore ML source stash in premerge test Signed-off-by: Peixin Li --- ci/Jenkinsfile.premerge | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/Jenkinsfile.premerge b/ci/Jenkinsfile.premerge index bcf9e7f1..43df740d 100644 --- a/ci/Jenkinsfile.premerge +++ b/ci/Jenkinsfile.premerge @@ -182,6 +182,7 @@ pipeline { container('gpu') { timeout(time: 2, unit: 'HOURS') { // step only timeout for test run try { + unstash "source_tree" common.resolveIncompatibleDriverIssue(this) sh 'bash ci/test.sh pre-merge' error('TEMPORARY: fail after regular test run to validate debug bundle upload') From 0983b2de0237b2de01327cc507840fbbb366221a Mon Sep 17 00:00:00 2001 From: Peixin Li Date: Tue, 2 Jun 2026 10:48:18 +0800 Subject: [PATCH 4/4] Revert "TEMP: Force premerge debug bundle upload" This reverts commit 37cfae93354fbf24fcd95ddd66c8c23a0ef04bc2. --- ci/Jenkinsfile.premerge | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/Jenkinsfile.premerge b/ci/Jenkinsfile.premerge index 43df740d..d7b2a15d 100644 --- a/ci/Jenkinsfile.premerge +++ b/ci/Jenkinsfile.premerge @@ -185,7 +185,6 @@ pipeline { unstash "source_tree" common.resolveIncompatibleDriverIssue(this) sh 'bash ci/test.sh pre-merge' - error('TEMPORARY: fail after regular test run to validate debug bundle upload') } catch (e) { common.uploadDebugBundle(this, 'spark-rapids-ml', 'premerge') throw e