Sync from upstream

runs-on · Sep 26, 2024 · 432c20f · 432c20f
1 parent e0d3c5c
commit 432c20f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/releases/ubuntu24/arm64/images/ubuntu/scripts/build/install-java-tools.sh b/releases/ubuntu24/arm64/images/ubuntu/scripts/build/install-java-tools.sh
@@ -12,7 +12,7 @@ create_java_environment_variable() {
     local java_version=$1
     local default=$2
 
-    local install_path_pattern="/usr/lib/jvm/temurin-${java_version}-jdk-amd64"
+    local install_path_pattern="/usr/lib/jvm/temurin-${java_version}-jdk-arm64"
 
     if [[ ${default} == "True" ]]; then
         echo "Setting up JAVA_HOME variable to ${install_path_pattern}"
@@ -21,16 +21,16 @@ create_java_environment_variable() {
         update-java-alternatives -s ${install_path_pattern}
     fi
 
-    echo "Setting up JAVA_HOME_${java_version}_X64 variable to ${install_path_pattern}"
-    set_etc_environment_variable "JAVA_HOME_${java_version}_X64" "${install_path_pattern}"
+    echo "Setting up JAVA_HOME_${java_version}_ARM64 variable to ${install_path_pattern}"
+    set_etc_environment_variable "JAVA_HOME_${java_version}_ARM64" "${install_path_pattern}"
 }
 
 install_open_jdk() {
     local java_version=$1
 
     # Install Java from PPA repositories.
     apt-get -y install temurin-${java_version}-jdk=\*
-    java_version_path="/usr/lib/jvm/temurin-${java_version}-jdk-amd64"
+    java_version_path="/usr/lib/jvm/temurin-${java_version}-jdk-arm64"
 
     java_toolcache_path="${AGENT_TOOLSDIRECTORY}/Java_Temurin-Hotspot_jdk"
 
@@ -52,10 +52,10 @@ install_open_jdk() {
     mkdir -p "${java_toolcache_version_path}"
 
     # Create a complete file
-    touch "${java_toolcache_version_path}/x64.complete"
+    touch "${java_toolcache_version_path}/arm64.complete"
 
     # Create symlink for Java
-    ln -s ${java_version_path} "${java_toolcache_version_path}/x64"
+    ln -s ${java_version_path} "${java_toolcache_version_path}/arm64"
 
     # add extra permissions to be able execute command without sudo
     chmod -R 777 /usr/lib/jvm

diff --git a/releases/ubuntu24/arm64/images/ubuntu/scripts/tests/Java.Tests.ps1 b/releases/ubuntu24/arm64/images/ubuntu/scripts/tests/Java.Tests.ps1
@@ -7,7 +7,7 @@ Describe "Java" {
 
     It "Java <DefaultJavaVersion> is default" -TestCases @{ DefaultJavaVersion = $defaultVersion } {
         $actualJavaPath = [System.Environment]::GetEnvironmentVariable("JAVA_HOME")
-        $expectedJavaPath = [System.Environment]::GetEnvironmentVariable("JAVA_HOME_${DefaultJavaVersion}_X64")
+        $expectedJavaPath = [System.Environment]::GetEnvironmentVariable("JAVA_HOME_${DefaultJavaVersion}_ARM64")
 
         $actualJavaPath | Should -Not -BeNullOrEmpty
         $expectedJavaPath | Should -Not -BeNullOrEmpty
@@ -24,7 +24,7 @@ Describe "Java" {
     $testCases = $jdkVersions | ForEach-Object { @{Version = $_ } }
 
     It "Java <Version>" -TestCases $testCases {
-        $javaVariableValue = [System.Environment]::GetEnvironmentVariable("JAVA_HOME_${Version}_X64")
+        $javaVariableValue = [System.Environment]::GetEnvironmentVariable("JAVA_HOME_${Version}_ARM64")
         $javaVariableValue | Should -Not -BeNullOrEmpty
         $javaPath = Join-Path $javaVariableValue "bin/java"