Revert "Setting customized sdk url and sdk resource as non customized…

… ignores the sdk resource value #2097 (#3266)" (#3294) This reverts commit 4009cfb.
adoptium · Jan 27, 2022 · 107e89e · 107e89e
1 parent 6989936
commit 107e89e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase
@@ -369,12 +369,11 @@ def setup() {
 
 			if (params.SDK_RESOURCE == 'nightly' && params.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}'"
 			} else {
-				error("For customized sdk resource, please provide the sdk url as CUSTOMIZED_SDK_URL")
+				CUSTOMIZED_SDK_URL_OPTION = ""
 			}
 			if (params.CUSTOMIZED_SDK_SOURCE_URL) {
 				SDK_RESOURCE = "customized"