Fix JAVA_HOME

CHANGELOG.md

@@ -26,6 +26,9 @@ Dropping a requirement of a major version of a dependency is a new contract.
 ## [Unreleased]
 [Unreleased]: https://github.com/atlassian/infrastructure/compare/release-4.29.0...master
 
+### Fixed
+- Fix `JAVA_HOME` in `OpenJDK` and `OpenJDK11`.
+
 ## [4.29.0] - 2024-06-04
 [4.29.0]: https://github.com/atlassian/infrastructure/compare/release-4.28.3...release-4.29.0
 

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jvm/OpenJDK.kt

@@ -2,6 +2,7 @@ package com.atlassian.performance.tools.infrastructure.api.jvm
 
 import com.atlassian.performance.tools.infrastructure.PreinstalledJDK
 import com.atlassian.performance.tools.infrastructure.api.os.Ubuntu
+import com.atlassian.performance.tools.infrastructure.jvm.UbuntuJavaHome
 import com.atlassian.performance.tools.ssh.api.SshConnection
 import java.time.Duration
 
@@ -16,10 +17,11 @@ class OpenJDK : VersionedJavaDevelopmentKit {
             listOf("openjdk-8-jdk"),
             Duration.ofMinutes(10)
         )
+        UbuntuJavaHome().install(connection)
     }
 
     override fun use(): String {
-        return ""
+        return UbuntuJavaHome().use()
     }
 
     override fun command(options: String): String {

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jvm/OpenJDK11.kt

@@ -2,6 +2,7 @@ package com.atlassian.performance.tools.infrastructure.api.jvm
 
 import com.atlassian.performance.tools.infrastructure.PreinstalledJDK
 import com.atlassian.performance.tools.infrastructure.api.os.Ubuntu
+import com.atlassian.performance.tools.infrastructure.jvm.UbuntuJavaHome
 import com.atlassian.performance.tools.ssh.api.SshConnection
 import java.time.Duration
 
@@ -16,10 +17,11 @@ class OpenJDK11 : VersionedJavaDevelopmentKit {
             listOf("openjdk-11-jdk"),
             Duration.ofMinutes(5)
         )
+        UbuntuJavaHome().install(connection)
     }
 
     override fun use(): String {
-        return ""
+        return UbuntuJavaHome().use()
     }
 
     override fun command(options: String): String {

src/main/kotlin/com/atlassian/performance/tools/infrastructure/jvm/UbuntuJavaHome.kt

@@ -0,0 +1,18 @@
+package com.atlassian.performance.tools.infrastructure.jvm
+
+import com.atlassian.performance.tools.infrastructure.PreinstalledJDK
+import com.atlassian.performance.tools.infrastructure.api.os.Ubuntu
+import com.atlassian.performance.tools.ssh.api.SshConnection
+import java.time.Duration
+
+internal class UbuntuJavaHome {
+    fun install(connection: SshConnection) {
+        // parse `java-1.8.0-openjdk-arm64       1081       /usr/lib/jvm/java-1.8.0-openjdk-arm64`
+        val javaHome = connection.safeExecute("update-java-alternatives --list").output.split(" ").last().trim()
+        connection.execute("echo 'export JAVA_HOME=$javaHome' >> ~/.profile")
+    }
+
+    fun use(): String {
+        return "source ~/.profile"
+    }
+}

src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/jvm/JdkSupport.kt

@@ -12,7 +12,7 @@ class JdkSupport(
             val ssh = ubuntu.toSsh()
             ssh.newConnection().use { connection ->
                 jdk.install(connection)
-                val javaHomeOutput = connection.execute("source ~/.profile; echo \$JAVA_HOME").output
+                val javaHomeOutput = connection.execute("${jdk.use()}; echo \$JAVA_HOME").output
 
                 assertThat(javaHomeOutput).contains(expectedJavaPath)
             }

src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/jvm/OpenJdk11IT.kt

@@ -8,4 +8,9 @@ class OpenJdk11IT {
     fun shouldSupportJstat() {
         JstatSupport(OpenJDK11()).shouldSupportJstat()
     }
+
+    @Test
+    fun shouldHaveJavaHome() {
+        JdkSupport(OpenJDK11()).shouldHaveJavaHomeSet("/usr/lib/jvm/java-1.11.0-openjdk-")
+    }
 }

src/test/kotlin/com/atlassian/performance/tools/infrastructure/api/jvm/OpenJdkIT.kt

@@ -8,4 +8,9 @@ class OpenJdkIT {
     fun shouldSupportJstat() {
         JstatSupport(OpenJDK()).shouldSupportJstat()
     }
+
+    @Test
+    fun shouldHaveJavaHome() {
+        JdkSupport(OpenJDK()).shouldHaveJavaHomeSet("/usr/lib/jvm/java-1.8.0-openjdk-")
+    }
 }