From: David Galloway Date: Wed, 6 Aug 2025 20:24:01 +0000 (-0400) Subject: Merge pull request #2412 from ceph/specific-sha1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bedbfe9242f27bd5bb75f65173e57d4d9604eeb2;p=ceph-build.git Merge pull request #2412 from ceph/specific-sha1 Build specific commits with new build pipelines --- bedbfe9242f27bd5bb75f65173e57d4d9604eeb2 diff --cc ceph-dev-pipeline/build/Jenkinsfile index 2c614a5d,1266444d..1e869050 --- a/ceph-dev-pipeline/build/Jenkinsfile +++ b/ceph-dev-pipeline/build/Jenkinsfile @@@ -263,22 -264,18 +264,26 @@@ pipeline ) } script { + def sha1_trimmed = env.SHA1.trim().toLowerCase() def sha1_props = readProperties file: "${WORKSPACE}/dist/sha1" - env.SHA1 = sha1_props.SHA1 - println "SHA1=${env.SHA1}" + sha1_from_artifact = sha1_props.SHA1.trim().toLowerCase() + if ( env.SHA1 && sha1_from_artifact != sha1_trimmed ) { + error message: "SHA1 from artifact (${sha1_from_artifact}) does not match parameter value (${sha1_trimmed})" + } + println "SHA1=${sha1_trimmed}" env.VERSION = readFile(file: "${WORKSPACE}/dist/version").trim() + def branch_ui_value = env.BRANCH + def sha1_ui_value = env.SHA1 + if ( env.CEPH_REPO.find(/https?:\/\/github.com\//) ) { + def branch_url = "${env.CEPH_REPO}/tree/${env.BRANCH}" + branch_ui_value = "${env.BRANCH}" + def commit_url = "${env.CEPH_REPO}/commit/${env.SHA1}" + sha1_ui_value = "${env.SHA1}" + } def shaman_url = "https://shaman.ceph.com/builds/ceph/${env.BRANCH}/${env.SHA1}" def build_description = """\ - BRANCH=${env.BRANCH}
- SHA1=${env.SHA1}
+ BRANCH=${branch_ui_value}
+ SHA1=${sha1_ui_value}
VERSION=${env.VERSION}
DISTROS=${env.DISTROS}
ARCHS=${env.ARCHS}