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
13 changes: 8 additions & 5 deletions ci/Jenkinsfile.premerge
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}

Expand Down Expand Up @@ -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}"
}
}
Expand Down Expand Up @@ -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}"
}
}
Expand All @@ -184,8 +181,14 @@ 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 {
unstash "source_tree"
common.resolveIncompatibleDriverIssue(this)
sh 'bash ci/test.sh pre-merge'
} catch (e) {
common.uploadDebugBundle(this, 'spark-rapids-ml', 'premerge')
throw e
}
Comment thread
pxLi marked this conversation as resolved.
}
}
}
Expand Down