Update: change weekly pipeline releaseType from "Release" to "Weekly" (#639)

* Update: change weekly pipeline releaseType from "Release" to "Weekly"

Signed-off-by: Wen Zhou <[email protected]>

* Update: add new field "WEEKLY" to indicate downstream job to run TCK job

    - this need to update IndividualBuildConfig in "jenkins-helper"

Signed-off-by: Zhou, Wen <[email protected]>

---------

Signed-off-by: Wen Zhou <[email protected]>
Signed-off-by: Zhou, Wen <[email protected]>
Co-authored-by: Andrew Leonard <[email protected]>

Author: zdtsw

pipelines/build/common/build_base_file.groovy

@@ -98,6 +98,8 @@ class Builder implements Serializable {
             javaToBuild = 'jdk'
         }
 
+        Boolean isWeekly = (releaseType == "Weekly") ? true : false
+
         def additionalNodeLabels = formAdditionalBuildNodeLabels(platformConfig, variant)
 
         def additionalTestLabels = formAdditionalTestLabels(platformConfig, variant)
@@ -177,6 +179,7 @@ class Builder implements Serializable {
             ADDITIONAL_FILE_NAME_TAG: platformConfig.additionalFileNameTag as String,
             JDK_BOOT_VERSION: platformConfig.bootJDK as String,
             RELEASE: release,
+            WEEKLY: isWeekly,
             PUBLISH_NAME: publishName,
             ADOPT_BUILD_NUMBER: adoptBuildNumber,
             ENABLE_REPRODUCIBLE_COMPARE: enableReproducibleCompare,

pipelines/build/common/config_regeneration.groovy

@@ -480,6 +480,7 @@ class Regeneration implements Serializable {
                 ADDITIONAL_FILE_NAME_TAG: platformConfig.additionalFileNameTag as String,
                 JDK_BOOT_VERSION: platformConfig.bootJDK as String,
                 RELEASE: false,
+                WEEKLY: false,
                 PUBLISH_NAME: '',
                 ADOPT_BUILD_NUMBER: '',
                 ENABLE_REPRODUCIBLE_COMPARE: enableReproducibleCompare,

pipelines/build/common/openjdk_build_pipeline.groovy

@@ -1730,7 +1730,7 @@ class Build {
                 def enableTests = Boolean.valueOf(buildConfig.ENABLE_TESTS)
                 def enableInstallers = Boolean.valueOf(buildConfig.ENABLE_INSTALLERS)
                 def enableSigner = Boolean.valueOf(buildConfig.ENABLE_SIGNER)
-                def isRelease = Boolean.valueOf(buildConfig.RELEASE)
+                def enableTCK = Boolean.valueOf(buildConfig.RELEASE) || Boolean.valueOf(buildConfig.WEEKLY)
                 def useAdoptShellScripts = Boolean.valueOf(buildConfig.USE_ADOPT_SHELL_SCRIPTS)
                 def cleanWorkspace = Boolean.valueOf(buildConfig.CLEAN_WORKSPACE)
                 def cleanWorkspaceAfter = Boolean.valueOf(buildConfig.CLEAN_WORKSPACE_AFTER)
@@ -1923,7 +1923,7 @@ class Build {
                         //Only smoke tests succeed TCK and AQA tests will be triggerred.
                         if (runSmokeTests() == 'SUCCESS') {
                             // Remote trigger Eclipse Temurin JCK tests
-                            if (buildConfig.VARIANT == 'temurin' && isRelease) {
+                            if (buildConfig.VARIANT == 'temurin' && enableTCK) {
                                 def platform = ''
                                 if (buildConfig.ARCHITECTURE.contains('x64')) {
                                     platform = 'x86-64_' + buildConfig.TARGET_OS

pipelines/build/common/weekly_release_pipeline.groovy

@@ -29,7 +29,7 @@ stage('Submit Release Pipelines') {
         cleanWs notFailBuild: false
     }
 
-    // For each variant, create a weekly pipeline job with release as "releaseType"
+    // For each variant, create a weekly pipeline job with "Weekly" as "releaseType"
     scmRefs.each { variant ->
         def variantName = variant.key
         def scmRef = variant.value
@@ -47,12 +47,12 @@ stage('Submit Release Pipelines') {
                 stage("Build - ${params.buildPipeline} - ${variantName}") {
                     result = build job: "${params.buildPipeline}",
                             parameters: [
-                                string(name: 'releaseType',        value: 'Release'),
+                                string(name: 'releaseType',        value: 'Weekly'),
                                 string(name: 'scmReference',       value: scmRef),
                                 text(name: 'targetConfigurations', value: JsonOutput.prettyPrint(JsonOutput.toJson(targetConfig))),
                                 ['$class': 'BooleanParameterValue', name: 'keepReleaseLogs', value: false]
                             ]
-                    // For reproducible builds (releaseType==Release) to have comparison on multiple builds' artifacts.
+                    // For reproducible builds to have comparison on multiple builds' artifacts.
                     // Copy artifacts from downstream and archive again on weekly-pipeline. For details, see issue: https://github.com/adoptium/ci-jenkins-pipelines/issues/301
                     if (result.getCurrentResult() == 'SUCCESS') {
                         node('worker') {

pipelines/build/regeneration/build_pipeline_generator.groovy

@@ -254,7 +254,7 @@ node('worker') {
                 if (enablePipelineSchedule.toBoolean()) {
                     config.put('pipelineSchedule', target.triggerSchedule_weekly)
                 }
-                config.releaseType = "Release"
+                config.releaseType = "Weekly"
 
                 println "[INFO] CREATING JDK${javaVersion} WEEKLY RELEASE PIPELINE WITH NEW CONFIG VALUES:"
                 println "JOB_NAME = ${config.JOB_NAME}"

pipelines/jobs/release_pipeline_job_template.groovy

@@ -62,7 +62,7 @@ pipelineJob("${BUILD_FOLDER}/${JOB_NAME}") {
     parameters {
         // important items to verify before trigger release pipeline
         textParam('targetConfigurations', JsonOutput.prettyPrint(JsonOutput.toJson(targetConfigurations)))
-        stringParam('releaseType', 'Release', "only for release purpose")
+        stringParam('releaseType', 'Release', "only for official release purpose")
         booleanParam('useAdoptBashScripts', true, "If enabled, the downstream job will pull and execute <code>make-adopt-build-farm.sh</code> from adoptium/temurin-build. If disabled, it will use whatever the job is running inside of at the time, usually it's the default repository in the configuration.")
         stringParam('scmReference', '', 'Tag name or Branch name from which openjdk source code repo to build')
         stringParam('buildReference', releaseTag, 'SHA1 or Tag name or Branch name of temurin-build repo. Defaults to master')

pipelines/src/test/groovy/IndividualBuildConfigTest.groovy

@@ -3,9 +3,9 @@ import groovy.json.JsonOutput
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 
-/**
- * Tests for IndividualBuildConfig
- */
+/** Test Class for IndividualBuildConfig.
+ * @author Adoptium Temurin
+*/
 class IndividualBuildConfigTest {
 
     @Test
@@ -43,6 +43,7 @@ class IndividualBuildConfigTest {
                 ADDITIONAL_FILE_NAME_TAG   : 'k',
                 JDK_BOOT_VERSION           : 'l',
                 RELEASE                    : false,
+                WEEKLY                     : false,
                 PUBLISH_NAME               : 'm',
                 ADOPT_BUILD_NUMBER         : 'n',
                 ENABLE_TESTS               : true,