[ci] Skip JDK install if near match is found in $(JI_JAVA_HOME) (#9585)

The JDK install step has been updated to optionally skip installation if a close enough match is found in the $(JI_JAVA_HOME) directory. This should allow us to skip JDK provisioning on our test jobs.
dotnet · Dec 4, 2024 · bf1a482 · bf1a482
1 parent 65906e0
commit bf1a482
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs b/build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidTestDependencies.cs
@@ -18,7 +18,7 @@ protected Scenario_AndroidTestDependencies (string name, string description)
 		protected override void AddSteps (Context context)
 		{
 			Steps.Add (new Step_InstallDotNetPreview ());
-			Steps.Add (new Step_InstallMicrosoftOpenJDK ());
+			Steps.Add (new Step_InstallMicrosoftOpenJDK (allowJIJavaHomeMatch: true));
 			Steps.Add (new Step_Android_SDK_NDK (AndroidSdkNdkType));
 
 			// disable installation of missing programs...

diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallAdoptOpenJDK.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallAdoptOpenJDK.cs
@@ -24,9 +24,13 @@ abstract partial class Step_InstallOpenJDK : StepWithDownloadProgress, IBuildInv
 			Path.Combine ("include", "jni.h"),
 		};
 
-		public Step_InstallOpenJDK (string description)
+		bool AllowJIJavaHomeMatch = false;
+
+		public Step_InstallOpenJDK (string description, bool allowJIJavaHomeMatch = false)
 			: base (description)
-		{}
+		{
+			AllowJIJavaHomeMatch = allowJIJavaHomeMatch;
+		}
 
 		protected   abstract    string  ProductName     {get;}
 		protected   abstract    string  JdkInstallDir	{get;}
@@ -55,7 +59,22 @@ protected override async Task<bool> Execute (Context context)
 				return true;
 			}
 
-			Log.StatusLine ($"{ProductName} {JdkVersion} r{JdkRelease} will be installed");
+			// Check for a JDK installed on CI with a matching major version to use for test jobs
+			var jiJavaHomeVarValue = Environment.GetEnvironmentVariable ("JI_JAVA_HOME");
+			if (AllowJIJavaHomeMatch && Directory.Exists (jiJavaHomeVarValue)) {
+				jdkInstallDir = jiJavaHomeVarValue;
+				OpenJDKExistsAndIsValid (jdkInstallDir, out installedVersion);
+				if (Version.TryParse (installedVersion, out Version? cversion) && cversion != null) {
+					if (cversion.Major == JdkVersion.Major) {
+						Log.Status ($"{ProductName} with version ");
+						Log.Status (installedVersion ?? "Unknown", ConsoleColor.Yellow);
+						Log.StatusLine (" already installed in: ", jdkInstallDir, tailColor: ConsoleColor.Cyan);
+						return true;
+					}
+				}
+			}
+
+			Log.StatusLine ($"{ProductName} {JdkVersion} r{JdkRelease} will be installed to {jdkInstallDir}");
 			Uri jdkURL = JdkUrl;
 			if (jdkURL == null)
 				throw new InvalidOperationException ($"{ProductName} URL must not be null");
@@ -196,9 +215,9 @@ bool OpenJDKExistsAndIsValid (string installDir, out string? installedVersion)
 				return false;
 			}
 
+			installedVersion = cv;
 			string xaVersionFile = Path.Combine (installDir, XAVersionInfoFile);
 			if (!File.Exists (xaVersionFile)) {
-				installedVersion = cv;
 				Log.DebugLine ($"Unable to find .NET for Android version file {xaVersionFile}");
 				return false;
 			}
@@ -215,8 +234,6 @@ bool OpenJDKExistsAndIsValid (string installDir, out string? installedVersion)
 				return false;
 			}
 
-			installedVersion = $"{cv} r{rv}";
-
 			if (!Version.TryParse (cv, out Version? cversion) || cversion == null) {
 				Log.DebugLine ($"Unable to parse {ProductName} version from: {cv}");
 				return false;
@@ -271,8 +288,8 @@ class Step_InstallMicrosoftOpenJDK : Step_InstallOpenJDK {
 
 		const string _ProductName = "Microsoft OpenJDK";
 
-		public Step_InstallMicrosoftOpenJDK ()
-			: base ($"Installing {_ProductName}")
+		public Step_InstallMicrosoftOpenJDK (bool allowJIJavaHomeMatch = false)
+			: base ($"Installing {_ProductName}", allowJIJavaHomeMatch)
 		{
 		}