Rebase

Signed-off-by: Sophia Guo <[email protected]>

pipelines/build/common/build_base_file.groovy

@@ -770,11 +770,6 @@ class Builder implements Serializable {
     Call job to push artifacts to github. Usually it's only executed on a nightly build
     */
     def publishBinary() {
-        if (release) {
-            // make sure to skip on release
-            context.println('Not publishing release')
-            return
-        }
 
         def timestamp = new Date().format('yyyy-MM-dd-HH-mm', TimeZone.getTimeZone('UTC'))
         def tag = "${javaToBuild}-${timestamp}"
@@ -784,8 +779,8 @@ class Builder implements Serializable {
         }
 
         context.stage('publish') {
-        context.println "publishing with publishName: ${publishName}"
-        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: false],
@@ -798,6 +793,41 @@ class Builder implements Serializable {
         }
     }
 
+    /*
+    Call job to dry run Release Publish, generate release publish jenkins link
+    */
+    def dryrunReleasePublish(IndividualBuildConfig config) {
+        def javaVersion=determineReleaseToolRepoVersion()
+        context.stage('Dry run release publish') {
+            def prefixOfArtifactsToCopy = "**/${config.TARGET_OS}/${config.ARCHITECTURE}/${config.VARIANT}"
+            def artifactsToCopy = "${prefixOfArtifactsToCopy}/*.tar.gz,${prefixOfArtifactsToCopy}/*.zip,${prefixOfArtifactsToCopy}/*.sha256.txt,${prefixOfArtifactsToCopy}/*.msi,${prefixOfArtifactsToCopy}/*.pkg,${prefixOfArtifactsToCopy}/*.json,${prefixOfArtifactsToCopy}/*.sig"
+            context.println "Dry run publishing : ${publishName} ${config.TARGET_OS} ${config.ARCHITECTURE}" 
+            def releaseJob = context.build job: 'build-scripts/release/refactor_openjdk_release_tool',
+                parameters: [
+                    ['$class': 'BooleanParameterValue', name: 'RELEASE', value: release],
+                    ['$class': 'BooleanParameterValue', name: 'DRY_RUN', value: true],
+                    context.string(name: 'TAG', value: publishName),
+                    context.string(name: 'UPSTREAM_JOB_NAME', value: env.JOB_NAME),
+                    context.string(name: 'UPSTREAM_JOB_NUMBER', value: "${currentBuild.getNumber()}"),
+                    context.string(name: 'ARTIFACTS_TO_COPY', value: "${artifactsToCopy}"),
+                    context.string(name: 'ARTIFACTS_TO_SKIP', value: '**/*testimage*'),
+                    context.string(name: 'VERSION', value: javaVersion)
+                ]
+            String releaseToolUrl = "${HUDSON_URL}job/build-scripts/job/release/job/refactor_openjdk_release_tool/parambuild?"
+            // pulbish release link - if dry run succeeds the link to ready to publish,  if dry run fails the link is dry run link
+            releaseToolUrl += "VERSION=${javaVersion}&TAG=${publishName}&RELEASE=true&UPSTREAM_JOB_NAME=${env.JOB_NAME}&UPSTREAM_JOB_NUMBER=${currentBuild.getNumber()}&ARTIFACTS_TO_COPY=${artifactsToCopy}&ARTIFACTS_TO_SKIP=**/*testimage*"
+            def releaseComment = "Release Publish"
+            if (releaseJob.getResult()) {
+                releaseToolUrl += "&DRY_RUN=false"
+                releaseComment = "Dry run release publish"
+            } else {
+                releaseToolUrl += "&DRY_RUN=true"
+            }
+            URLEncoder.encode(releaseToolUrl.toString(), "UTF-8")
+            return ["${releaseToolUrl}", "${releaseComment}"]
+        }
+    }
+
     /*
     Main function. This is what is executed remotely via the [release-|evaluation-]openjdkxx-pipeline and pr-tester jobs
     Running in the *openjdkX-pipeline
@@ -843,6 +873,9 @@ class Builder implements Serializable {
             context.echo "Force auto generate AQA test jobs: ${aqaAutoGen}"
             context.echo "Keep test reportdir: ${keepTestReportDir}"
             context.echo "Keep release logs: ${keepReleaseLogs}"
+            def releaseSummary = manager.createSummary('next.svg')
+            releaseSummary.appendText('<b>RELEASE PUBLISH BINARIES:</b><ul>', false)
+
             jobConfigurations.each { configuration ->
                 jobs[configuration.key] = {
                     IndividualBuildConfig config = configuration.value
@@ -891,7 +924,7 @@ class Builder implements Serializable {
                                                 if ( ! ( "${config.TARGET_OS}"    ==~ /^[A-Za-z0-9\/\.\-_]*$/ ) ||
                                                      ! ( "${config.ARCHITECTURE}" ==~ /^[A-Za-z0-9\/\.\-_]*$/ ) ||
                                                      ! ( "${config.VARIANT}"      ==~ /^[A-Za-z0-9\/\.\-_]*$/ ) ) {
-                                                    throw new Exception("[ERROR] Dubious character in TARGET_OS, ARCHITECTURE or VARIANT - aborting");
+                                                    throw new Exception('[ERROR] Dubious character in TARGET_OS, ARCHITECTURE or VARIANT - aborting')
                                                 }
                                                 context.sh "rm -rf target/${config.TARGET_OS}/${config.ARCHITECTURE}/${config.VARIANT}/"
                                             }
@@ -934,6 +967,8 @@ class Builder implements Serializable {
                                         }
 
                                         copyArtifactSuccess = true
+                                        def (String releaseToolUrl, String releaseComment) = dryrunReleasePublish(config)
+                                        releaseSummary.appendText("<li><a href=${releaseToolUrl}> ${releaseComment} ${config.VARIANT} ${publishName} ${config.TARGET_OS} ${config.ARCHITECTURE}</a></li>")
                                     }
                             }
                             context.println '[NODE SHIFT] OUT OF CONTROLLER NODE!'
@@ -957,7 +992,7 @@ class Builder implements Serializable {
                 }
             }
             context.parallel jobs
-
+            releaseSummary.appendText('</ul>', false)
             // publish to github if needed
             // Don't publish release automatically
             if (publish && !release) {