From 9fd063790c64a7cf2f9ee38c4bf4655f430d8be6 Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Sat, 1 Oct 2022 13:21:32 +0200 Subject: [PATCH] feat: add 3 new parameters for branch (#41) * feat: add 3 new parameters for branch - build_ref for temurin-build branch/tag - ci_ref for ci-jenkins-pipeline branch/tag - helper_ref for jenkins-helper branch/tag * update: add comments for usage --- src/common/IndividualBuildConfig.groovy | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/common/IndividualBuildConfig.groovy b/src/common/IndividualBuildConfig.groovy index b1da344..b58d8d6 100644 --- a/src/common/IndividualBuildConfig.groovy +++ b/src/common/IndividualBuildConfig.groovy @@ -25,6 +25,9 @@ class IndividualBuildConfig implements Serializable { final List DYNAMIC_LIST final List NUM_MACHINES final String SCM_REF + final String BUILD_REF + final String CI_REF + final String HELPER_REF final String AQA_REF final boolean AQA_AUTO_GEN final String BUILD_ARGS @@ -89,8 +92,14 @@ class IndividualBuildConfig implements Serializable { } else { NUM_MACHINES = [] } - + // git ref(tag/SHA1) from openjdk source code repo SCM_REF = map.get("SCM_REF") != null ? map.get("SCM_REF").trim() : null + // git ref(tag/SHA1/branch) from temurin-build repo + BUILD_REF = map.get("BUILD_REF") != null ? map.get("BUILD_REF").trim() : null + // git ref(tag/SHA1/branch) from ci-jenkins-pipeline repo + CI_REF = map.get("CI_REF") != null ? map.get("CI_REF").trim() : null + // git ref(tag/branch) from jenkins-helper repo ( do not accept SHA1 due to jenkins shared library limitation ) + HELPER_REF = map.get("HELPER_REF") != null ? map.get("HELPER_REF").trim() : null AQA_REF = map.get("AQA_REF") != null ? map.get("AQA_REF").trim() : null AQA_AUTO_GEN = map.get("AQA_AUTO_GEN") BUILD_ARGS = map.get("BUILD_ARGS") != null ? map.get("BUILD_ARGS").trim() : null @@ -148,6 +157,9 @@ class IndividualBuildConfig implements Serializable { DYNAMIC_LIST : DYNAMIC_LIST, NUM_MACHINES : NUM_MACHINES, SCM_REF : SCM_REF, + BUILD_REF : BUILD_REF, + CI_REF : CI_REF, + HELPER_REF : HELPER_REF, AQA_REF : AQA_REF, AQA_AUTO_GEN : AQA_AUTO_GEN, BUILD_ARGS : BUILD_ARGS,