From e222381101dd59c8a046ac0dd6b8bf1806efd364 Mon Sep 17 00:00:00 2001
From: Stewart X Addison <sxa@redhat.com>
Date: Tue, 27 Jun 2023 13:57:09 +0100
Subject: [PATCH] Add login to be able to auto-publish JDK22 ea builds

---
 pipelines/build/common/build_base_file.groovy | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy
index 513ff5e0b..eaaeeebd9 100644
--- a/pipelines/build/common/build_base_file.groovy
+++ b/pipelines/build/common/build_base_file.groovy
@@ -765,13 +765,28 @@ class Builder implements Serializable {
             tag = publishName
         }
 
+        if (javaToBuild=="jdk21" && scmReference && !release) {
+          publishName = scmReference.replace('_adopt','')
+          def firstDot=publishName.indexOf('.')
+          def plusSign=publishName.indexOf('+')
+          def secondDot=publishName.indexOf('.', firstDot+1)
+          def thirdDot=publishName.indexOf('.', secondDot+1)
+          // Translate jdk-AA+BB to jdk-AA-0-BB
+          // Translate jdk-AA.B.C+DD to jdk-AA-C-DD-ea-beta
+          // Note that jdk-AA-B-C-D+EE will become jdk-AA-C-D-EE-ea-beta
+          if ( firstDot==-1 ) publishName=publishName.substring(4,plusSign)+'.0.'+publishName.substring(plusSign+1)
+          else publishName=publishName.substring(4,firstDot)+publishName.substring(secondDot).replace("+","-")
+          publishName='ea_'+publishName.replaceAll("\\.","-")
+        }
+
         context.stage('publish') {
-            context.build job: 'build-scripts/release/refactor_openjdk_release_tool',
+        context.println "publishing with publishName: ${publishName}"
+         context.build job: 'build-scripts/release/refactor_openjdk_release_tool',
                     parameters: [
                         ['$class': 'BooleanParameterValue', name: 'RELEASE', value: release],
                         ['$class': 'BooleanParameterValue', name: 'DRY_RUN', value: ((releaseType=="Weekly" && javaVersion=="jdk21") ? true : false)],
-                        context.string(name: 'TAG', value: tag),
-                        context.string(name: 'TIMESTAMP', value: timestamp),
+                        context.string(name: 'TAG', value: (javaToBuild=="jdk21"?(scmReference.replace('_adopt','')):tag)),
+                        context.string(name: 'TIMESTAMP', value: (javaToBuild=="jdk"?publishName:timestamp)),
                         context.string(name: 'UPSTREAM_JOB_NAME', value: env.JOB_NAME),
                         context.string(name: 'UPSTREAM_JOB_NUMBER', value: "${currentBuild.getNumber()}"),
                         context.string(name: 'VERSION', value: javaVersion )