Jenkins: Add option to prefix Artifactory build names

The internal Artifactory server is forcing us touse a buildName prefix. This adds the option to have a buildName prefix. However, we don't need this at the OpenJ9 Jenkins farm so defaults.yml sets the option to empty string. Should be merged after eclipse-openj9#16102 Signed-off-by: Adam Brousseau <[email protected]>
AdamBrousseau · Oct 16, 2023 · b5cf282 · b5cf282
1 parent 85d65e0
commit b5cf282
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/buildenv/jenkins/common/build.groovy b/buildenv/jenkins/common/build.groovy
@@ -673,6 +673,10 @@ 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.

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