updated jenkinsfile methods to work for both arm and non arm

Author: nagalakshmi

Jenkinsfile

@@ -1,7 +1,7 @@
 @Library('shared-libraries') _
 
-def getJavaHomePath() {
-		if (params.arm_regressions) {
+def getJavaHomePath(isArm = false) {
+		if (isArm) {
 				def version = (env.JAVA_VERSION == "JAVA21") ? "21" : "17"
 				def path = "/usr/lib/jvm/java-${version}-amazon-corretto.aarch64"
 				return path
@@ -14,12 +14,12 @@ def getJavaHomePath() {
 		}
 }
 
-def getPlatform() {
-	return params.arm_regressions ? "linux/arm64" : "linux/amd64"
+def getPlatform(isArm = false) {
+	return isArm ? "linux/arm64" : "linux/amd64"
 }
 
-def setConverters() {
-	return params.arm_regressions ? "false" :"true"
+def setConverters(isArm = false) {
+	return isArm ? "false" :"true"
 }
 
 def setupDockerMarkLogic(String image) {
@@ -51,7 +51,6 @@ def setupDockerMarkLogic(String image) {
 
 def runTests(String image) {
 	setupDockerMarkLogic(image)
-
 	sh label: 'run marklogic-client-api tests', script: '''#!/bin/bash
 			export JAVA_HOME=$JAVA_HOME_DIR
 			export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
@@ -189,7 +188,6 @@ pipeline {
 
 	parameters {
 		booleanParam(name: 'regressions', defaultValue: false, description: 'indicator if build is for regressions')
-		booleanParam(name: 'arm_regressions', defaultValue: false, description: 'indicator if build is for ARM regressions')
 		string(name: 'JAVA_VERSION', defaultValue: 'JAVA17', description: 'Either JAVA17 or JAVA21')
 		string(name: 'MARKLOGIC_IMAGE_TAGS', defaultValue: 'marklogic-server-ubi:latest-11,marklogic-server-ubi:latest-12', description: 'Comma-delimited list of MarkLogic image tags including variant (e.g., marklogic-server-ubi:latest-11,marklogic-server-ubi-rootless:11.3.2). The registry/org (ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic) path will be prepended automatically.')
 	}
@@ -207,7 +205,7 @@ pipeline {
 		stage('pull-request-tests') {
 			when {
 				expression {
-					return !params.regressions && !params.arm_regressions
+					return !params.regressions
 				}
 			}
 			steps {
@@ -247,7 +245,6 @@ pipeline {
 				not {
 					anyOf {
 						expression { return params.regressions }
-						expression { return params.arm_regressions }
 					}
 				}
 			}
@@ -268,7 +265,6 @@ pipeline {
 				allOf {
 					branch 'develop'
 					expression { return params.regressions }
-					expression { return !params.arm_regressions }
 				}
 			}
 
@@ -283,7 +279,7 @@ pipeline {
 
 						stage(stageName) {
 							try {
-								runTests(fullImage)
+								runTests(fullImage, false)
 							} finally {
 								junit '**/build/**/TEST*.xml'
 								updateWorkspacePermissions()
@@ -299,7 +295,6 @@ pipeline {
 			when {
 				allOf {
 					branch 'develop'
-					expression { return params.arm_regressions }
 					expression { return !params.regressions }
 				}
 			}
@@ -384,12 +379,15 @@ pipeline {
 			when {
 				allOf {
 					branch 'develop'
-					expression { return params.arm_regressions }
 					expression { return !params.regressions }
 				}
 			}
 			agent { label "java-client-agent-${BUILD_NUMBER}" }
-
+			environment {
+				JAVA_HOME_DIR = getJavaHomePath(true)
+				PLATFORM = getPlatform(true)
+				MARKLOGIC_INSTALL_CONVERTERS = setConverters(true)
+			}
 			steps {
 				checkout([$class: 'GitSCM',
 						branches: scm.branches,
@@ -447,7 +445,6 @@ pipeline {
 					} else {
 						echo "ℹ️ No EC2 instance IP found, skipping Terraform cleanup"
 					}
-
 					// Cleanup Jenkins agent using shared library function
 					def nodeName = "java-client-agent-${BUILD_NUMBER}"
 					echo "🗑️ Cleaning up Jenkins agent: ${nodeName}"