UI test for mac 2024.3 setup

staicy123 · Dec 4, 2024 · 57ec6a0 · 57ec6a0
1 parent 2d3cd9f
commit 57ec6a0
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/test/resources/ci/scripts/setup.sh b/src/test/resources/ci/scripts/setup.sh
@@ -122,17 +122,18 @@ installJDK() {
         curl -fsSL -o /tmp/liberty-dev-tool-semeru-jdk.tar.gz "$url"
         echo "${SEMERU_ARCHIVE_LINUX_SHA256}  /tmp/liberty-dev-tool-semeru-jdk.tar.gz" | sha256sum -c -
         tar -xzf /tmp/liberty-dev-tool-semeru-jdk.tar.gz -C "$SOFTWARE_INSTALL_DIR"
-    elif [[ $OS == "Darwin" ]]; then
-       javaHome="$javaHome"/Contents/Home
-        ARCH="x64"
-              if [ $(uname -m) = "arm64" ]; then
-                ARCH="aarch64"
-                SEMERU_ARCHIVE_MAC_SHA256=${SEMERU_ARCHIVE_MAC_ARM64_SHA256}
-              fi
-              local url="https://github.com/ibmruntimes/semeru${SEMERU_OPEN_JDK_MAJOR}-binaries/releases/download/jdk-${SEMERU_OPEN_JDK_VERSION}%2B${SEMERU_OPEN_JDK_BUILD}_openj9-${SEMERU_OPENJ9_VERSION}/ibm-semeru-open-jdk_${ARCH}_mac_${SEMERU_OPEN_JDK_VERSION}_${SEMERU_OPEN_JDK_BUILD}_openj9-${SEMERU_OPENJ9_VERSION}.tar.gz" curl -fsSL -o /tmp/liberty-dev-tool-semeru-jdk.tar.gz "$url"
-       echo "${SEMERU_ARCHIVE_MAC_SHA256}  /tmp/liberty-dev-tool-semeru-jdk.tar.gz" | shasum -a 256 -c -
-       tar -xzf /tmp/liberty-dev-tool-semeru-jdk.tar.gz -C "$SOFTWARE_INSTALL_DIR"
-    else
+       elif [[ $OS == "Darwin" ]]; then
+           javaHome="$javaHome"/Contents/Home
+           ARCH="x64"
+           if [ $(uname -m) = "arm64" ]; then
+             ARCH="aarch64"
+             SEMERU_ARCHIVE_MAC_SHA256=${SEMERU_ARCHIVE_MAC_ARM64_SHA256}
+           fi
+           local url="https://github.com/ibmruntimes/semeru${SEMERU_OPEN_JDK_MAJOR}-binaries/releases/download/jdk-${SEMERU_OPEN_JDK_VERSION}%2B${SEMERU_OPEN_JDK_BUILD}_openj9-${SEMERU_OPENJ9_VERSION}/ibm-semeru-open-jdk_${ARCH}_mac_${SEMERU_OPEN_JDK_VERSION}_${SEMERU_OPEN_JDK_BUILD}_openj9-${SEMERU_OPENJ9_VERSION}.tar.gz"
+           curl -fsSL -o /tmp/liberty-dev-tool-semeru-jdk.tar.gz "$url"
+           echo "${SEMERU_ARCHIVE_MAC_SHA256}  /tmp/liberty-dev-tool-semeru-jdk.tar.gz" | shasum -a 256 -c -
+           tar -xzf /tmp/liberty-dev-tool-semeru-jdk.tar.gz -C "$SOFTWARE_INSTALL_DIR"
+       else
         local url="https://github.com/ibmruntimes/semeru${SEMERU_OPEN_JDK_MAJOR}-binaries/releases/download/jdk-${SEMERU_OPEN_JDK_VERSION}%2B${SEMERU_OPEN_JDK_BUILD}_openj9-${SEMERU_OPENJ9_VERSION}/ibm-semeru-open-jdk_x64_windows_${SEMERU_OPEN_JDK_VERSION}_${SEMERU_OPEN_JDK_BUILD}_openj9-${SEMERU_OPENJ9_VERSION}.zip"
         curl -fsSL -o /tmp/liberty-dev-tool-semeru-jdk.zip "$url"
         local shaAll=$(certutil -hashfile /tmp/liberty-dev-tool-semeru-jdk.zip SHA256)