From: Zack Cerza <zack@redhat.com>
Date: Wed, 29 Jan 2025 23:23:10 +0000 (-0700)
Subject: ceph-dev-pipeline: Add more info to build desc
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2310%2Fhead;p=ceph-build.git

ceph-dev-pipeline: Add more info to build desc

BRANCH, DISTROS, ARCHS, SETUP_BUILD_ID with a link to the setup build.

Signed-off-by: Zack Cerza <zack@cerza.org>
---

diff --git a/ceph-dev-pipeline/build/Jenkinsfile b/ceph-dev-pipeline/build/Jenkinsfile
index 62687108..08b72709 100644
--- a/ceph-dev-pipeline/build/Jenkinsfile
+++ b/ceph-dev-pipeline/build/Jenkinsfile
@@ -30,8 +30,8 @@ pipeline {
             env.SETUP_BUILD_ID = setup_build.getNumber()
           }
           println "SETUP_BUILD_ID=${env.SETUP_BUILD_ID}"
-          def setup_build_url = new URI([env.JENKINS_URL, "job", "ceph-dev-new-setup", env.SETUP_BUILD_ID].join("/")).normalize()
-          println "${setup_build_url}"
+          env.SETUP_BUILD_URL = new URI([env.JENKINS_URL, "job", "ceph-dev-new-setup", env.SETUP_BUILD_ID].join("/")).normalize()
+          println "${env.SETUP_BUILD_URL}"
         }
       }
     }
@@ -104,12 +104,18 @@ pipeline {
                   def sha1_props = readProperties file: "${WORKSPACE}/dist/sha1"
                   env.SHA1 = sha1_props.SHA1
                   println "SHA1=${env.SHA1}"
-                  env.VERSION = readFile file: "${WORKSPACE}/dist/version"
+                  env.VERSION = readFile(file: "${WORKSPACE}/dist/version").trim()
                   def shaman_url = "https://shaman.ceph.com/builds/ceph/${env.BRANCH}/${env.SHA1}"
-                  def build_description = """SHA1=${env.SHA1}<br />
+                  def build_description = """\
+                    BRANCH=${env.BRANCH}<br />
+                    SHA1=${env.SHA1}<br />
                     VERSION=${env.VERSION}<br />
+                    DISTROS=${env.DISTROS}<br />
+                    ARCHS=${env.ARCHS}<br />
+                    FLAVOR=${env.FLAVOR}<br />
+                    <a href="${env.SETUP_BUILD_URL}">SETUP_BUILD_ID=${env.SETUP_BUILD_ID}</a><br />
                     <a href="${shaman_url}">shaman builds for this branch+commit</a>
-                  """
+                  """.stripIndent()
                   buildDescription build_description
                 }
                 sh "sha256sum dist/*"