Added the changed in file

adoptium · May 9, 2024 · fa653d8 · fa653d8
1 parent 6876b4f
commit fa653d8
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase
@@ -40,7 +40,7 @@ def setupEnv() {
 	env.JOBSTARTTIME = sh(script: 'LC_TIME=C date +"%a, %d %b %Y %T %z"', returnStdout: true).trim()
 
 	// Terminate any previous test related processes that are running
-	terminateTestProcesses()
+    terminateTestProcesses()
 
 	if ( params.JDK_VERSION ) {
 		env.ORIGIN_JDK_VERSION = params.JDK_VERSION
@@ -107,8 +107,8 @@ def setupEnv() {
 	NUM_MACHINES = params.NUM_MACHINES ? params.NUM_MACHINES.toInteger() : 1
 	env.LIB_DIR = JOB_NAME.contains("SmokeTests") ? "${WORKSPACE}/../../../../../testDependency/lib" : "${WORKSPACE}/../../testDependency/lib"
 	env.SYSTEM_LIB_DIR = JOB_NAME.contains("SmokeTests") ? "${WORKSPACE}/../../../../../testDependency/system_lib" : "${WORKSPACE}/../../testDependency/system_lib"
-	env.OPENJCEPLUS_GIT_REPO = params.OPENJCEPLUS_GIT_REPO ?: "https://github.com/IBM/OpenJCEPlus.git"
-	env.OPENJCEPLUS_GIT_BRANCH = params.OPENJCEPLUS_GIT_BRANCH ?: "java${params.JDK_VERSION}"
+    env.OPENJCEPLUS_GIT_REPO = params.OPENJCEPLUS_GIT_REPO ?: "https://github.com/ibmruntimes/OpenJCEPlus.git"
+	env.OPENJCEPLUS_GIT_BRANCH = params.OPENJCEPLUS_GIT_BRANCH ?: "semeru-java${params.JDK_VERSION}"
 
 	env.LIGHT_WEIGHT_CHECKOUT = (params.LIGHT_WEIGHT_CHECKOUT == false) ? params.LIGHT_WEIGHT_CHECKOUT : true
 	env.GENERATE_JOBS = params.GENERATE_JOBS ?: false
@@ -206,7 +206,7 @@ def setupParallelEnv() {
 
 			try {
 				// check pre-stage test libs on the machine
-				// check for each lib. If lib does not exist, download it.
+				// check for each lib. If lib does not exist, donwload it.
 				// If lib exists, SHA will be checked. Re-download if SHA does not match.
 				timeout(time: 20, unit: 'MINUTES') {
 					def defaultUrl = "https://ci.adoptium.net/job/test.getDependency/lastSuccessfulBuild/artifact/"
@@ -221,7 +221,6 @@ def setupParallelEnv() {
                     } else {
                         sh "perl ./aqa-tests/TKG/scripts/getDependencies.pl -path ${env.LIB_DIR} -task default"
                     }
-				}
 			} catch (Exception e) {
 				echo 'Exception: ' + e.toString()
 				echo "Cannot pre-stage test libs from ${env.LIB_DIR} on the machine. Skipping..."
@@ -682,6 +681,18 @@ def buildTest() {
 			echo "Cannot pre-stage test libs from ${env.LIB_DIR} on the machine. Skipping..."
 		}
 
+		try {
+			if (env.BUILD_LIST.contains('system')) {
+				//get pre-staged test jars from systemtest.getDependency build before system test compilation
+				timeout(time: 60, unit: 'MINUTES') {
+					copyArtifacts fingerprintArtifacts: true, projectName: "systemtest.getDependency", selector: lastSuccessful(), target: 'aqa-tests'
+				}
+			}
+		} catch (Exception e) {
+			echo 'Exception: ' + e.toString()
+			echo 'Cannot run copyArtifacts from test.getDependency/systemtest.getDependency. Skipping copyArtifacts...'
+		}
+
 		if (BUILD_LIST.contains("external")){
 			try {
 				timeout(time: 60, unit: 'MINUTES') {
@@ -1017,10 +1028,10 @@ def testExecution() {
 def terminateTestProcesses() {
 	echo "PROCESSCATCH: Terminating any hung/left over test processes:"
 
-	def statusCode=sh(script:"aqa-tests/terminateTestProcesses.sh ${env.USER} 2>&1", returnStatus:true)
-	if (statusCode != 0) {
-			echo "rc = ${statusCode}, Unable to terminate all processes."
-	}
+    def statusCode=sh(script:"aqa-tests/terminateTestProcesses.sh ${env.USER} 2>&1", returnStatus:true)
+    if (statusCode != 0) {
+            echo "rc = ${statusCode}, Unable to terminate all processes."
+    }
 }
 
 def getJDKImpl(jvm_version) {