Add Options for AdoptOpenJDK and Java 11 (openhab#869)

* Add Option for AdoptOpenJDK Fixes openhab#868 See Also openhab#629 * Add Java 11 Support * Prepare Java for inclusion in openHABian image Signed-off-by: Ethan Dye <[email protected]> Signed-off-by: Markus Storm <[email protected]>
mstormi · Jun 10, 2020 · e48ff03 · e48ff03
1 parent 646fd2b
commit e48ff03
Show file tree

Hide file tree

Showing 13 changed files with 440 additions and 196 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -42,7 +42,7 @@ jobs:
       env: aarch64
       arch: arm64
       script:
-        - sed -i 's/java_arch=32-bit$/java_arch=64-bit/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-64/' build-image/openhabian.conf
         - docker build -t openhabian/dev-openhabian -f Dockerfile.openhabian-aarch64-native .
         - docker run -i openhabian/dev-openhabian bash -c '/usr/local/bin/bats -r -f "dev-." .'
         - docker run -i openhabian/dev-openhabian bash -c '/usr/local/bin/bats -r -f "unit-." .'
@@ -59,7 +59,7 @@ jobs:
       script:
         # 64bit Azul Java native on 64bit x86 on 64bit OS on Travis AMD64 HW
         - export HW=x86
-        - sed -i 's/java_arch=32-bit$/java_arch=64-bit/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-64/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-x86 .
         - echo -e "\n\e[36mopenHABian test installation 64bit Azul Enterprise Java on virtual $HW ...\n"
         - docker run --name "openhabian-${HW}" -d openhabian/${HW}-openhabian;
@@ -69,7 +69,7 @@ jobs:
       script:
         # 32bit Azul Java on 32bit ARMv6hf (RPi0(W) and RPi1) on 32bit OS on Travis Arm64 HW
         - export HW=rpi01
-        - sed -i 's/java_arch=64-bit$/java_arch=32-bit/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-32/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-ARMv6hf-native .
         - echo -e "\n\e[36mopenHABian test installation 32bit Azul Embedded Java on virtual $HW ...\n"
         - docker run --name "openhabian-${HW}" -d openhabian/${HW}-openhabian;
@@ -79,7 +79,7 @@ jobs:
       script:
         # 32bit Azul Java on 32bit ARMv7l (RPi2) on 32bit OS on Travis Arm64 HW
         - export HW=rpi2
-        - sed -i 's/java_arch=64-bit$/java_arch=32-bit/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-32/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-arm32hf-native .
         - echo -e "\n\e[36mopenHABian test installation 32bit Azul Embedded Java on virtual $HW ...\n"
         - docker run --memory="1g" --memory-reservation="1g" --name "openhabian-${HW}" -d openhabian/${HW}-openhabian
@@ -89,7 +89,7 @@ jobs:
       script:
         # 32bit Azul Java on 64bit ARMv8 (CM3, RPi3) on 32bit OS on Travis Arm64 HW
         - export HW=cm3
-        - sed -i 's/java_arch=64-bit$/java_arch=32-bit/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-32/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-arm32hf-CM3 .
         - echo -e "\n\e[36mopenHABian test installation 32bit Azul Embedded Java on virtual $HW ...\n"
         - docker run --memory="1g" --memory-reservation="1g" --name "openhabian-${HW}" -d openhabian/${HW}-openhabian;
@@ -100,7 +100,7 @@ jobs:
         # 64bit Azul Java on 32bit ARMv8 (RPi3, CM3) on 32bit OS on Travis Arm64 HW
         # This is known to not work - openHABian is supposed to downgrade to 32bit on install.
         - export HW=rpi3
-        - sed -i 's/java_arch=32-bit$/java_arch=64-bit/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-64/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-arm32hf-native .
         - echo -e "\n\e[36mopenHABian test installation 64bit Azul Embedded Java on virtual $HW ..."
         - echo -e "\e[31m ** This is known to not work. openHABian is supposed to force install down to 32bit **\n"
@@ -112,7 +112,7 @@ jobs:
         # 64bit Azul Java on 64bit ARMv8 (RPi3,4) on 32bit OS on Travis Arm64 HW
         # This is known to not work - openHABian is supposed to downgrade to 32bit on install.
         - export HW=rpi3
-        - sed -i 's/java_arch=32-bit$/java_arch=64-bit/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-64/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-aarch64-native .
         - echo -e "\n\e[36mopenHABian test installation 64bit Azul Embedded Java on virtual $HW ..."
         - echo -e "\e[31m ** This is known to not work. openHABian is supposed to force install down to 32bit **\n"
@@ -123,8 +123,18 @@ jobs:
       script:
         # 64bit Azul Java on 64bit ARMv8 (RPi3,4) on 64bit OS on Travis Arm64 HW
         - export HW=rpi4
-        - sed -i 's/java_arch=32-bit$/java_arch=64-bit/' build-image/openhabian.conf
+        - sed -i 's/^java_opt=.*/java_opt=Zulu8-64/' build-image/openhabian.conf
         - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-aarch64-64bit .
         - echo -e "\n\e[36mopenHABian test installation 64bit Azul Embedded Java \e[31m on 64bit OS\e[36m on virtual $HW ...\n"
         - docker run --memory="2G" --memory-reservation="2G" --name "openhabian-${HW}" -d openhabian/${HW}-openhabian;
+          docker exec -i "openhabian-${HW}" bash -c './build.bash local-test && mv ~/.profile ~/.bash_profile && /etc/rc.local'
+    - env: aarch64
+      arch: arm64
+      script:
+        # AdoptOpenJDK Java on 32bit ARMv7 on 32bit OS on Travis Arm64 HW
+        - export HW=rpi2
+        - sed -i 's/^java_opt=.*/java_opt=Adopt11/' build-image/openhabian.conf
+        - docker build -t openhabian/${HW}-openhabian -f Dockerfile.openhabian-arm32hf-native .
+        - echo -e "\n\e[36mopenHABian test installation 64bit AdoptOpenJDK 11 Java \e[31m on 32bit OS\e[36m on virtual $HW ...\n"
+        - docker run --memory="1g" --memory-reservation="1g" --name "openhabian-${HW}" -d openhabian/${HW}-openhabian;
         - docker exec -i "openhabian-${HW}" bash -c './build.bash local-test && mv ~/.profile ~/.bash_profile && /etc/rc.local'
diff --git a/build-image/openhabian.conf b/build-image/openhabian.conf
@@ -66,7 +66,7 @@ debugmode=on
 #release=buster
 
 # Java architecture mode
-# values: "Zulu32", "Zulu64" or "AdoptOpenJDK"
-java_arch=32-bit
+# Valid arguments: "Adopt11", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
+java_opt=Zulu8-32
 
 # vim: filetype=sh
diff --git a/build-image/openhabian.pi-raspbian.conf b/build-image/openhabian.pi-raspbian.conf
@@ -66,7 +66,7 @@ debugmode=off
 #release=buster
 
 # Java architecture mode
-# values: "Zulu32", "Zulu64" or "AdoptOpenJDK"
-java_arch=32-bit
+# Valid arguments: "Adopt11", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
+java_opt=Zulu8-32
 
 # vim: filetype=sh
diff --git a/build-image/openhabian.pine64-xenial.conf b/build-image/openhabian.pine64-xenial.conf
@@ -26,5 +26,5 @@ wifi_country=""
 # vim: filetype=sh
 
 # Java architecture mode
-# Use 32-bit or 64-bit
-java_arch=32-bit
+# Valid arguments: "Adopt11", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
+java_opt=Zulu8-32
diff --git a/docs/NEWSLOG.md b/docs/NEWSLOG.md
@@ -28,5 +28,4 @@ openHAB 3 will be Java 11 only.  2.5.X is supposed to work on both, Java 8 and J
 Running the current openHAB on Java 11 however has not been tested on a wide scale.
 
 Please participate in beta testing to help create a smooth transition user experience for all of us.
-See [announcement thread](https://community.openhab.org/t/Java-testdrive/99827) on the community forum.
-
+See [announcement thread](https://community.openhab.org/t/java-testdrive/99827) on the community forum.
diff --git a/functions/config.bash b/functions/config.bash
@@ -31,19 +31,19 @@ clean_config_userpw() {
 }
 
 ## Update java architecture in config file
-## Valid options: "32-bit" & "64-bit"
+## Valid arguments: "Adopt11", "Zulu8-32", "Zulu8-64", "Zulu11-32", or "Zulu11-64"
 update_config_java() {
-  if [ "$1" == "64-bit" ]; then
+  if [ "$1" == "Zulu8-64" ] || [ "$1" == "Zulu11-64" ]; then
     if (! is_x86_64 && ! [ "$(getconf LONG_BIT)" == "64" ]) || (! is_aarch64 && ! [ "$(getconf LONG_BIT)" == "64" ]); then
       if [ -n "$INTERACTIVE" ]; then
-        whiptail --title "Incompatible hardware detected" --msgbox "Zulu OpenJDK 64-bit: this option does not currently work on your platform.\\n\\nDefaulting to 32-bit installation." 10 60
+        whiptail --title "Incompatible hardware detected" --msgbox "Zulu OpenJDK 64-bit: this option does not currently work on your platform.\\n\\nDefaulting to Java Zulu 8 32-bit installation." 10 60
       else
-        echo "Zulu OpenJDK 64-bit: this option does not currently work on your platform. Defaulting to 32-bit installation."
+        echo "Zulu OpenJDK 64-bit: this option does not currently work on your platform. Defaulting to Java Zulu 8 32-bit installation."
       fi
-      cond_redirect grep -q '^java_arch' "$CONFIGFILE" && sed -i "s/^java_arch.*/java_arch=32-bit/" "$CONFIGFILE" || echo "java_arch=32-bit" >> "$CONFIGFILE"
+      cond_redirect grep -q '^java_opt' "$CONFIGFILE" && sed -i "s/^java_opt.*/java_opt=Zulu8-32/" "$CONFIGFILE" || echo "java_opt=Zulu8-32" >> "$CONFIGFILE"
     fi
   else
-    cond_redirect grep -q '^java_arch' "$CONFIGFILE" && sed -i "s/^java_arch.*/java_arch=$1/" "$CONFIGFILE" || echo "java_arch=$1" >> "$CONFIGFILE"
+    cond_redirect grep -q '^java_opt' "$CONFIGFILE" && sed -i "s/^java_opt.*/java_opt=$1/" "$CONFIGFILE" || echo "java_opt=$1" >> "$CONFIGFILE"
   fi
   # shellcheck disable=SC1090
   source "$CONFIGFILE"