Merge pull request #295 from dinogun/add_version_14

WIP: Add support generating Version 14 images.
AdoptOpenJDK · Mar 18, 2020 · 589afc8 · 589afc8
2 parents c863254 + 18d9626
commit 589afc8
Show file tree

Hide file tree

Showing 11 changed files with 325 additions and 35 deletions.
diff --git a/build_all.sh b/build_all.sh
@@ -39,10 +39,11 @@ do
 
 			err=$?
 			if [ ${err} != 0 ] ||  [ ! -f ./push_commands.sh ]; then
+				echo "#############################################"
 				echo
 				echo "ERROR: Docker Build for version ${ver} failed."
 				echo
-				exit 1;
+				echo "#############################################"
 			fi
 			echo
 			echo "WARNING: Pushing to AdoptOpenJDK repo on hub.docker.com"

diff --git a/build_latest.sh b/build_latest.sh
@@ -57,8 +57,11 @@ function build_image() {
 	echo "#####################################################"
 	# shellcheck disable=SC2086 # ignoring ${tags} due to whitespace problem
 	if ! docker build --pull --no-cache ${tags} -f "${dockerfile}" . ; then
+		echo "#############################################"
+		echo
 		echo "ERROR: Docker build of image: ${tags} from ${dockerfile} failed."
-		exit 1
+		echo
+		echo "#############################################"
 	fi
 }
 
@@ -149,10 +152,6 @@ do
 		# Generate all the Dockerfiles for each of the builds and build types
 		for btype in ${btypes}
 		do
-			# Do not build anything built by Official Docker builds.
-			if [ "${os}" == "ubuntu" ] && [ "${build}" == "releases" ] && [ "${btype}" == "full" ]; then
-				continue;
-			fi
 			file="${dir}/Dockerfile.${vm}.${build}.${btype}"
 			generate_dockerfile "${file}" "${package}" "${build}" "${btype}" "${os}"
 			if [ ! -f "${file}" ]; then

diff --git a/common_functions.sh b/common_functions.sh
@@ -40,16 +40,16 @@ all_arches="aarch64 armv7l ppc64le s390x x86_64 windows-amd windows-nano"
 all_packages="jdk jre"
 
 # Current JVM versions supported
-export supported_versions="8 11 13"
-export latest_version="13"
+export supported_versions="8 11 13 14"
+export latest_version="14"
 
 # Current builds supported
 export supported_builds="releases nightly"
 
 function check_version() {
 	version=$1
 	case ${version} in
-	8|9|10|11|12|13)
+	8|9|10|11|12|13|14)
 		;;
 	*)
 		echo "ERROR: Invalid version"
@@ -123,8 +123,8 @@ function get_arches() {
 	# corresponding build combination does not exist.
 	# Eg. jdk_openj9_10_releases_sums does not exist as we do not have any
 	# release builds for version 10 (Only nightly builds).
-	if [ -z "${1+x}" ]; then
-	  return;
+	if ! declare -p "$1" 2>/dev/null; then
+		return;
 	fi
 	archsums="$(declare -p "$1")";
 	eval "declare -A sums=""${archsums#*=}";

diff --git a/config/hotspot-official.config b/config/hotspot-official.config
@@ -13,7 +13,7 @@
 #
 
 OS: ubuntu windowsservercore-1809 windowsservercore-ltsc2016 nanoserver-1809
-Versions: 8 11 13
+Versions: 8 11 13 14
 
 Build: releases
 Type: full
@@ -134,3 +134,45 @@ Build: releases
 Type: full
 Architectures: windows-nano
 Directory: 13/jre/windows/nanoserver-1809
+
+######################################################################
+
+Build: releases
+Type: full
+Architectures: aarch64 armv7l x86_64 ppc64le s390x
+Directory: 14/jdk/ubuntu
+
+Build: releases
+Type: full
+Architectures: windows-amd
+Directory: 14/jdk/windows/windowsservercore-1809
+
+Build: releases
+Type: full
+Architectures: windows-amd
+Directory: 14/jdk/windows/windowsservercore-ltsc2016
+
+Build: releases
+Type: full
+Architectures: windows-nano
+Directory: 14/jdk/windows/nanoserver-1809
+
+Build: releases
+Type: full
+Architectures: aarch64 armv7l x86_64 ppc64le s390x
+Directory: 14/jre/ubuntu
+
+Build: releases
+Type: full
+Architectures: windows-amd
+Directory: 14/jre/windows/windowsservercore-1809
+
+Build: releases
+Type: full
+Architectures: windows-amd
+Directory: 14/jre/windows/windowsservercore-ltsc2016
+
+Build: releases
+Type: full
+Architectures: windows-nano
+Directory: 14/jre/windows/nanoserver-1809
diff --git a/config/hotspot.config b/config/hotspot.config
@@ -13,7 +13,7 @@
 #
 
 OS: alpine debian debianslim ubi ubi-minimal centos clefos ubuntu windowsservercore-1809 windowsservercore-ltsc2016 nanoserver-1809
-Versions: 8 11 13
+Versions: 8 11 13 14
 
 Build: releases nightly
 Type: full slim
@@ -105,7 +105,7 @@ Type: full
 Architectures: aarch64 x86_64 ppc64le s390x
 Directory: 8/jre/ubi-minimal
 
-Build: nightly
+Build: releases nightly
 Type: full
 Architectures: aarch64 x86_64 ppc64le s390x
 Directory: 8/jre/ubuntu
@@ -215,7 +215,7 @@ Type: full
 Architectures: s390x
 Directory: 11/jre/clefos
 
-Build: nightly
+Build: releases nightly
 Type: full
 Architectures: aarch64 armv7l x86_64 ppc64le s390x
 Directory: 11/jre/ubuntu
@@ -325,7 +325,7 @@ Type: full
 Architectures: s390x
 Directory: 13/jre/clefos
 
-Build: nightly
+Build: releases nightly
 Type: full
 Architectures: aarch64 armv7l x86_64 ppc64le s390x
 Directory: 13/jre/ubuntu
@@ -344,3 +344,115 @@ Build: nightly
 Type: full
 Architectures: windows-nano
 Directory: 13/jre/windows/nanoserver-1809
+
+###############################################################################
+
+Build: releases nightly
+Type: full slim
+Architectures: x86_64
+Directory: 14/jdk/alpine
+
+Build: releases nightly
+Type: full slim
+Architectures: aarch64 armv7l x86_64 ppc64le s390x
+Directory: 14/jdk/debian
+
+Build: releases nightly
+Type: full slim
+Architectures: aarch64 armv7l x86_64 ppc64le s390x
+Directory: 14/jdk/debianslim
+
+Build: releases nightly
+Type: full slim
+Architectures: aarch64 x86_64 ppc64le s390x
+Directory: 14/jdk/ubi
+
+Build: releases nightly
+Type: full
+Architectures: aarch64 x86_64 ppc64le s390x
+Directory: 14/jdk/ubi-minimal
+
+Build: releases nightly
+Type: full slim
+Architectures: aarch64 armv7l x86_64 ppc64le
+Directory: 14/jdk/centos
+
+Build: releases nightly
+Type: full slim
+Architectures: s390x
+Directory: 14/jdk/clefos
+
+Build: releases nightly
+Type: full slim
+Architectures: aarch64 armv7l x86_64 ppc64le s390x
+Directory: 14/jdk/ubuntu
+
+Build: nightly
+Type: full
+Architectures: windows-amd
+Directory: 14/jdk/windows/windowsservercore-1809
+
+Build: nightly
+Type: full
+Architectures: windows-amd
+Directory: 14/jdk/windows/windowsservercore-ltsc2016
+
+Build: nightly
+Type: full
+Architectures: windows-nano
+Directory: 14/jdk/windows/nanoserver-1809
+
+Build: releases nightly
+Type: full
+Architectures: x86_64
+Directory: 14/jre/alpine
+
+Build: releases nightly
+Type: full
+Architectures: aarch64 armv7l x86_64 ppc64le s390x
+Directory: 14/jre/debian
+
+Build: releases nightly
+Type: full
+Architectures: aarch64 armv7l x86_64 ppc64le s390x
+Directory: 14/jre/debianslim
+
+Build: releases nightly
+Type: full
+Architectures: aarch64 x86_64 ppc64le s390x
+Directory: 14/jre/ubi
+
+Build: releases nightly
+Type: full
+Architectures: aarch64 x86_64 ppc64le s390x
+Directory: 14/jre/ubi-minimal
+
+Build: releases nightly
+Type: full
+Architectures: aarch64 armv7l x86_64 ppc64le
+Directory: 14/jre/centos
+
+Build: releases nightly
+Type: full
+Architectures: s390x
+Directory: 14/jre/clefos
+
+Build: releases nightly
+Type: full
+Architectures: aarch64 armv7l x86_64 ppc64le s390x
+Directory: 14/jre/ubuntu
+
+Build: nightly
+Type: full
+Architectures: windows-amd
+Directory: 14/jre/windows/windowsservercore-1809
+
+Build: nightly
+Type: full
+Architectures: windows-amd
+Directory: 14/jre/windows/windowsservercore-ltsc2016
+
+Build: nightly
+Type: full
+Architectures: windows-nano
+Directory: 14/jre/windows/nanoserver-1809
diff --git a/config/openj9-official.config b/config/openj9-official.config
@@ -13,7 +13,7 @@
 #
 
 OS: ubuntu windowsservercore-1809 windowsservercore-ltsc2016
-Versions: 8 11 13
+Versions: 8 11 13 14
 
 Build: releases
 Type: full
@@ -104,3 +104,35 @@ Build: releases
 Type: full
 Architectures: windows-amd
 Directory: 13/jre/windows/windowsservercore-ltsc2016
+
+######################################################################
+
+Build: releases
+Type: full
+Architectures: x86_64 ppc64le s390x
+Directory: 14/jdk/ubuntu
+
+Build: releases
+Type: full
+Architectures: windows-amd
+Directory: 14/jdk/windows/windowsservercore-1809
+
+Build: releases
+Type: full
+Architectures: windows-amd
+Directory: 14/jdk/windows/windowsservercore-ltsc2016
+
+Build: releases
+Type: full
+Architectures: x86_64 ppc64le s390x
+Directory: 14/jre/ubuntu
+
+Build: releases
+Type: full
+Architectures: windows-amd
+Directory: 14/jre/windows/windowsservercore-1809
+
+Build: releases
+Type: full
+Architectures: windows-amd
+Directory: 14/jre/windows/windowsservercore-ltsc2016