Support custom target with variation (adoptium#4568)

resolves: adoptium#4495 Signed-off-by: Lan Xia <[email protected]> Co-authored-by: LongyuZhang <[email protected]>
web-logs2 · May 9, 2023 · 6ff1db2 · 6ff1db2
1 parent 84697ed
commit 6ff1db2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase
@@ -654,7 +654,9 @@ def runTest( ) {
 			if (TARGET == 'system_custom') {
 				env.SYSTEM_CUSTOM_TARGET=CUSTOM_TARGET
 			} else {
-				CUSTOM_OPTION = "${TARGET.toUpperCase()}_TARGET='${CUSTOM_TARGET}'"
+				// remove suffix, then set CUSTOM_OPTION (i.e., jdk_custom_0 will become jdk_custom)
+				def removeSuffix = TARGET.replaceAll(/_\d+$/, "")
+				CUSTOM_OPTION = "${removeSuffix.toUpperCase()}_TARGET='${CUSTOM_TARGET}'"
 			}
 		}
 		if (!TARGET.startsWith('-f')) {