From 3b24e6f0aaa676fe6b4be399d264e486c835d759 Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Tue, 6 Feb 2024 15:45:14 -0500
Subject: [PATCH] Only support the combo of ngihtly|customized and
 CUSTOMIZED_SDK_URL

Fail for all other combo

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 buildenv/jenkins/JenkinsfileBase | 49 ++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase
index a804f0045b..2ece140ebe 100644
--- a/buildenv/jenkins/JenkinsfileBase
+++ b/buildenv/jenkins/JenkinsfileBase
@@ -397,32 +397,37 @@ def createJob( TEST_JOB_NAME, ARCH_OS ) {
 def setup() {
 	stage('Setup') {
 		setupEnv()
-
-		if (params.SDK_RESOURCE == 'nightly' && params.CUSTOMIZED_SDK_URL) {
-			// remove single quote to allow variables to be set in CUSTOMIZED_SDK_URL
-			CUSTOMIZED_SDK_URL_OPTION = "-c ${params.CUSTOMIZED_SDK_URL}"
-		} else if (params.SDK_RESOURCE != 'customized') {
-			CUSTOMIZED_SDK_URL_OPTION = ""
-		} else if (params.CUSTOMIZED_SDK_URL) {
-			SDK_RESOURCE = "customized"
-			CUSTOMIZED_SDK_URL_OPTION = "-c '${params.CUSTOMIZED_SDK_URL}'"
-			if (params.ADDITIONAL_ARTIFACTS_REQUIRED == "RI_JDK") {
-				def server = Artifactory.server params.ARTIFACTORY_SERVER
-				def artifactoryUrl = server.getUrl()
-				def repoForRi = ''
-				def riURL = ''
-				if (params.ARTIFACTORY_REPO.contains(',')) {
-					String[] repos = params.ARTIFACTORY_REPO.split(",")
-					// Assumption: ARTIFACTORY_REPO=X,Y (X=to upload results, Y=to download ri)
-					repoForRi = repos[1].trim()
-					if (!env.SPEC.startsWith('aix') && !env.SPEC.startsWith('zos')) {
-						riURL = "${artifactoryUrl}/${repoForRi}/Latest/${PLATFORM}/${JDK_VERSION}"
+		if (params.CUSTOMIZED_SDK_URL) {
+			if (params.SDK_RESOURCE == 'nightly') {
+				// remove single quote to allow variables to be set in CUSTOMIZED_SDK_URL
+				CUSTOMIZED_SDK_URL_OPTION = "-c ${params.CUSTOMIZED_SDK_URL}"
+			} else if (!params.SDK_RESOURCE || params.SDK_RESOURCE == 'customized') { 
+				SDK_RESOURCE = "customized"
+				CUSTOMIZED_SDK_URL_OPTION = "-c '${params.CUSTOMIZED_SDK_URL}'"
+				if (params.ADDITIONAL_ARTIFACTS_REQUIRED == "RI_JDK") {
+					def server = Artifactory.server params.ARTIFACTORY_SERVER
+					def artifactoryUrl = server.getUrl()
+					def repoForRi = ''
+					def riURL = ''
+					if (params.ARTIFACTORY_REPO.contains(',')) {
+						String[] repos = params.ARTIFACTORY_REPO.split(",")
+						// Assumption: ARTIFACTORY_REPO=X,Y (X=to upload results, Y=to download ri)
+						repoForRi = repos[1].trim()
+						if (!env.SPEC.startsWith('aix') && !env.SPEC.startsWith('zos')) {
+							riURL = "${artifactoryUrl}/${repoForRi}/Latest/${PLATFORM}/${JDK_VERSION}"
+						}
 					}
+					CUSTOMIZED_SDK_URL_OPTION = "-c '${params.CUSTOMIZED_SDK_URL} ${riURL}'"
 				}
-				CUSTOMIZED_SDK_URL_OPTION = "-c '${params.CUSTOMIZED_SDK_URL} ${riURL}'"
+			} else {
+				error("SDK_RESOURCE: ${params.SDK_RESOURCE} and CUSTOMIZED_SDK_URL: ${params.CUSTOMIZED_SDK_URL} combo is not supported!")
 			}
 		} else {
-			error("SDK_RESOURCE set as customized, please provide the sdk url as CUSTOMIZED_SDK_URL")
+			if (params.SDK_RESOURCE == 'customized') { 
+				error("SDK_RESOURCE: ${params.SDK_RESOURCE}, please provide CUSTOMIZED_SDK_URL")
+			} else {
+				CUSTOMIZED_SDK_URL_OPTION = ""
+			}
 		}
 
 		if (SDK_RESOURCE == 'upstream') {