From 4fd9aa0a35dec0035596bdc0c00d96aac76b1d97 Mon Sep 17 00:00:00 2001
From: Jonathan Miller <jonmille@progress.com>
Date: Mon, 20 Apr 2026 13:38:27 -0400
Subject: [PATCH 1/2] MLE-28459 Added regression-12 arm stage

---
 Jenkinsfile | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0bb0c4c4b..22d52e17c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -361,6 +361,39 @@ pipeline {
 				}
 			}
 		}
+
+		stage('regressions-12 arm infrastructure') {
+			when {
+				beforeAgent true
+				branch 'develop'
+				expression { return params.regressions }
+				expression { return env.EC2_PRIVATE_IP != null }
+			}
+			agent { label "java-client-agent-${BUILD_NUMBER}" }
+			environment {
+				JAVA_HOME_DIR = getJavaHomePathForARM()
+				PLATFORM = "linux/arm64"
+				MARKLOGIC_INSTALL_CONVERTERS = "false"
+			}
+			steps {
+				checkout([$class                           : 'GitSCM',
+									branches                         : scm.branches,
+									doGenerateSubmoduleConfigurations: false,
+									extensions                       : [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'java-client-api']],
+									submoduleCfg                     : [],
+									userRemoteConfigs                : scm.userRemoteConfigs])
+
+				runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi9-arm:latest-12")
+			}
+			post {
+				always {
+					archiveArtifacts artifacts: 'java-client-api/**/build/reports/**/*.html'
+					junit '**/build/**/TEST*.xml'
+					updateWorkspacePermissions()
+					tearDownDocker()
+				}
+			}
+		}
 	}
 
 	post {

From 252ec9b7c677ea5a7d8048f9a74af95872cf0e38 Mon Sep 17 00:00:00 2001
From: Jonathan Miller <jonmille@progress.com>
Date: Thu, 23 Apr 2026 15:17:29 -0400
Subject: [PATCH 2/2] MLE-28459 Refactor regressions-arm infrastructure stage

---
 Jenkinsfile | 57 +++++++++++++++--------------------------------------
 1 file changed, 16 insertions(+), 41 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 22d52e17c..051c74f70 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -329,7 +329,7 @@ pipeline {
 			}
 		}
 
-		stage('regressions-11 arm infrastructure') {
+		stage('regressions-arm infrastructure') {
 			when {
 				beforeAgent true
 				branch 'develop'
@@ -350,47 +350,22 @@ pipeline {
 									submoduleCfg                     : [],
 									userRemoteConfigs                : scm.userRemoteConfigs])
 
-				runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi9-arm:latest-11")
-			}
-			post {
-				always {
-					archiveArtifacts artifacts: 'java-client-api/**/build/reports/**/*.html'
-					junit '**/build/**/TEST*.xml'
-					updateWorkspacePermissions()
-					tearDownDocker()
-				}
-			}
-		}
-
-		stage('regressions-12 arm infrastructure') {
-			when {
-				beforeAgent true
-				branch 'develop'
-				expression { return params.regressions }
-				expression { return env.EC2_PRIVATE_IP != null }
-			}
-			agent { label "java-client-agent-${BUILD_NUMBER}" }
-			environment {
-				JAVA_HOME_DIR = getJavaHomePathForARM()
-				PLATFORM = "linux/arm64"
-				MARKLOGIC_INSTALL_CONVERTERS = "false"
-			}
-			steps {
-				checkout([$class                           : 'GitSCM',
-									branches                         : scm.branches,
-									doGenerateSubmoduleConfigurations: false,
-									extensions                       : [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'java-client-api']],
-									submoduleCfg                     : [],
-									userRemoteConfigs                : scm.userRemoteConfigs])
+				script {
+					def imagePrefix = 'ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi9-arm:'
 
-				runTests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi9-arm:latest-12")
-			}
-			post {
-				always {
-					archiveArtifacts artifacts: 'java-client-api/**/build/reports/**/*.html'
-					junit '**/build/**/TEST*.xml'
-					updateWorkspacePermissions()
-					tearDownDocker()
+					['latest-11', 'latest-12'].each { tag ->
+						def fullImage = imagePrefix + tag
+						stage("regressions-arm-${tag}") {
+							try {
+								runTests(fullImage)
+							} finally {
+								archiveArtifacts artifacts: 'java-client-api/**/build/reports/**/*.html'
+								junit '**/build/**/TEST*.xml'
+								updateWorkspacePermissions()
+								tearDownDocker()
+							}
+						}
+					}
 				}
 			}
 		}