From c0ceef5e9478b0229106d20bba1e514b3e0c4148 Mon Sep 17 00:00:00 2001
From: absurdfarce <bret.mcguire@ibm.com>
Date: Tue, 1 Sep 2026 16:37:17 -0500
Subject: [PATCH] ninja-fix: Slight tweak to JVM selection to match what's on
 the new runners

---
 Jenkinsfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 24a69bf6..b439b8aa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,9 +19,13 @@ def initializeEnvironment() {
   env.GITHUB_COMMIT_URL = "${GITHUB_PROJECT_URL}/commit/${env.GIT_COMMIT}"
   env.NODEJS_VERSION_FULL = nodeVersions[env.NODEJS_VERSION]
 
-  env.JAVA8_HOME="${JABBA_HOME}/jdk/1.8"
-  env.JAVA11_HOME="${JABBA_HOME}/jdk/openjdk@1.11"
-  
+  env.JAVA8_HOME = sh(label: 'Get JAVA8_HOME (in case ccm needs it)',script: '''#!/bin/bash -le
+    . ${JABBA_SHELL}
+    jabba which 1.8''', returnStdout: true).trim()
+  env.JAVA11_HOME = sh(label: 'Get JAVA11_HOME (in case ccm needs it)',script: '''#!/bin/bash -le
+    . ${JABBA_SHELL}
+    jabba which openjdk@11''', returnStdout: true).trim()
+
   sh label: 'Assign Node.js global environment', script: '''#!/bin/bash -lex
     nodenv versions
     echo "Using Node.js runtime ${NODEJS_VERSION} (${NODEJS_VERSION_FULL})"