Add parameter SETUP_JCK_RUN explicitely

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
adoptium · Feb 3, 2023 · 6252ce6 · 6252ce6
1 parent 2f016a6
commit 6252ce6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase
@@ -516,7 +516,7 @@ def get_sources() {
 			sh "$GET_SH_CMD"
 		}
 	}
-	if (env.BUILD_LIST.contains('jck') && SDK_RESOURCE.contains('customized')) {
+	if (env.BUILD_LIST.contains('jck') && SDK_RESOURCE.contains('customized' && params.SETUP_JCK_RUN )) {
 		setup_jck_interactives()
 	}
 }

diff --git a/buildenv/jenkins/aqaTestPipeline.groovy b/buildenv/jenkins/aqaTestPipeline.groovy
@@ -15,6 +15,8 @@ def LABEL = (params.LABEL) ?: ""
 def LABEL_ADDITION = (params.LABEL_ADDITION) ?: ""
 def TEST_FLAG = (params.TEST_FLAG) ?: ""
 def APPLICATION_OPTIONS = (params.APPLICATION_OPTIONS) ?: ""
+def SETUP_JCK_RUN = params.SETUP_JCK_RUN ?: false
+
 
 // Use BUILD_USER_ID if set and jdk-JDK_VERSIONS
 def DEFAULT_SUFFIX = (env.BUILD_USER_ID) ? "${env.BUILD_USER_ID} - jdk-${params.JDK_VERSIONS}" : "jdk-${params.JDK_VERSIONS}"
@@ -116,7 +118,8 @@ JDK_VERSIONS.each { JDK_VERSION ->
                         string(name: 'LABEL_ADDITION', value: LABEL_ADDITION),
                         string(name: 'TEST_FLAG', value: TEST_FLAG),
                         string(name: 'APPLICATION_OPTIONS', value: APPLICATION_OPTIONS),
-                        booleanParam(name: 'KEEP_REPORTDIR', value: keep_reportdir)
+                        booleanParam(name: 'KEEP_REPORTDIR', value: keep_reportdir),
+                        booleanParam(name: 'SETUP_JCK_RUN', value: SETUP_JCK_RUN)
                     ], wait: true
                     def result = downstreamJob.getResult()
                     echo " ${TEST_JOB_NAME} result is ${result}"

diff --git a/buildenv/jenkins/testJobTemplate b/buildenv/jenkins/testJobTemplate
@@ -139,6 +139,7 @@ def OPENJ9_REPO = "https://github.com/eclipse-openj9/openj9.git"
 def ADOPTOPENJDK_REPO = "https://github.com/adoptium/aqa-tests.git"
 def ADOPTOPENJDK_BRANCH = "master"
 def USE_TESTENV_PROPERTIES = false
+def SETUP_JCK_RUN = false
 
 // Jenkins does not support using Repository URL and Branch build parameters with lightweight checkout together
 // (See https://issues.jenkins.io/browse/JENKINS-48431)
@@ -438,6 +439,7 @@ ARCH_OS_LIST.each { ARCH_OS ->
 							booleanParam('PERSONAL_BUILD', false, "Is this a personal build?")
 							booleanParam('USE_TESTENV_PROPERTIES', USE_TESTENV_PROPERTIES.toBoolean(), "use properties defined in the testenv.properties")
 							stringParam('RERUN_ITERATIONS', RERUN_ITERATIONS, "Optional. Number of times to repeat execution of failed test target(s).")
+							booleanParam('SETUP_JCK_RUN', SETUP_JCK_RUN.toBoolean(), "setup jdk during release for jck interactive run")
 						}
 						cpsScm {
 							scm {