Merge pull request #16103 from AdamBrousseau/prepend_arty_buildname

Jenkins: Add option to prefix Artifactory build names
eclipse-openj9 · Oct 16, 2023 · d5a2e02 · d5a2e02
2 parents 720a42a + b5cf282
commit d5a2e02
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/buildenv/jenkins/common/build.groovy b/buildenv/jenkins/common/build.groovy
@@ -673,12 +673,16 @@ def upload_artifactory_core(geo, uploadSpec) {
     // Add BUILD_IDENTIFIER to the buildInfo. The UploadSpec adds it to the Artifact info
     buildInfo.env.filter.addInclude("BUILD_IDENTIFIER")
     buildInfo.env.capture = true
+    if (ARTIFACTORY_CONFIG[geo]['buildNamePrefix'] != '') {
+        buildInfo.name = ARTIFACTORY_CONFIG[geo]['buildNamePrefix'] + '/' + JOB_NAME
+    }
+    println "buildInfo.name:$buildInfo.name"
 
     //Retry uploading to Artifactory if errors occur
     // Do not upload buildInfo if Server is behind a VPN as the Controller will not be able to talk to it.
     pipelineFunctions.retry_and_delay({
         server.upload spec: uploadSpec, buildInfo: buildInfo;
-        if ("${ARTIFACTORY_CONFIG[geo]['vpn']}" == "false") { server.publishBuildInfo buildInfo } },
+        server.publishBuildInfo buildInfo},
         3, 300)
 
     ARTIFACTORY_CONFIG[geo]['url'] = server.getUrl()

diff --git a/buildenv/jenkins/common/variables-functions.groovy b/buildenv/jenkins/common/variables-functions.groovy
@@ -861,6 +861,7 @@ def set_basic_artifactory_config(id="Nightly") {
             ARTIFACTORY_CONFIG[geo]['daysToKeepArtifacts'] = get_value(VARIABLES.artifactory.daysToKeepArtifacts, geo).toInteger()
             ARTIFACTORY_CONFIG[geo]['manualCleanup'] = get_value(VARIABLES.artifactory.manualCleanup, geo)
             ARTIFACTORY_CONFIG[geo]['vpn'] = get_value(VARIABLES.artifactory.vpn, geo)
+            ARTIFACTORY_CONFIG[geo]['buildNamePrefix'] = get_value(VARIABLES.artifactory.buildNamePrefix, geo)
         }
 
         /*

diff --git a/buildenv/jenkins/variables/defaults.yml b/buildenv/jenkins/variables/defaults.yml
@@ -71,6 +71,9 @@ artifactory:
     default: 'ci-openj9'
   uploadDir:
     default: "${repo}/${JOB_NAME}/${BUILD_ID}"
+  buildNamePrefix:
+    osu: ''
+    unb: ''
   daysToKeepArtifacts:
     osu: 40
     unb: 30