From bb7f6801f19cc4b36d92850273ee0f88a7807bf5 Mon Sep 17 00:00:00 2001 From: Dinakar Guniguntala Date: Wed, 17 Mar 2021 17:14:41 +0530 Subject: [PATCH 1/4] Script changes to add version 16 support. --- common_functions.sh | 6 ++--- config/hotspot-official.config | 44 +++++++++++++++++++++++++++++++++- config/openj9-official.config | 44 +++++++++++++++++++++++++++++++++- 3 files changed, 89 insertions(+), 5 deletions(-) diff --git a/common_functions.sh b/common_functions.sh index fd420a0a5..f33b1c4dd 100755 --- a/common_functions.sh +++ b/common_functions.sh @@ -52,8 +52,8 @@ PR_TEST_OSES="ubuntu alpine ubi" runtype="build" # Current JVM versions supported -export supported_versions="8 11 14 15" -export latest_version="15" +export supported_versions="16" +export latest_version="16" # Current builds supported export supported_builds="releases nightly" @@ -61,7 +61,7 @@ export supported_builds="releases nightly" function check_version() { version=$1 case ${version} in - 8|9|10|11|12|13|14|15) + 8|9|10|11|12|13|14|15|16) ;; *) echo "ERROR: Invalid version" diff --git a/config/hotspot-official.config b/config/hotspot-official.config index 9df32d6a2..d42c4d9e4 100644 --- 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 14 15 +Versions: 8 11 14 15 16 Build: releases Type: full @@ -218,3 +218,45 @@ Build: releases Type: full Architectures: windows-nano Directory: 15/jre/windows/nanoserver-1809 + +###################################################################### + +Build: releases +Type: full +Architectures: aarch64 armv7l x86_64 ppc64le s390x +Directory: 16/jdk/ubuntu + +Build: releases +Type: full +Architectures: windows-amd +Directory: 16/jdk/windows/windowsservercore-1809 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 16/jdk/windows/windowsservercore-ltsc2016 + +Build: releases +Type: full +Architectures: windows-nano +Directory: 16/jdk/windows/nanoserver-1809 + +Build: releases +Type: full +Architectures: aarch64 armv7l x86_64 ppc64le s390x +Directory: 16/jre/ubuntu + +Build: releases +Type: full +Architectures: windows-amd +Directory: 16/jre/windows/windowsservercore-1809 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 16/jre/windows/windowsservercore-ltsc2016 + +Build: releases +Type: full +Architectures: windows-nano +Directory: 16/jre/windows/nanoserver-1809 diff --git a/config/openj9-official.config b/config/openj9-official.config index dad0391f9..6f8268966 100644 --- a/config/openj9-official.config +++ b/config/openj9-official.config @@ -13,7 +13,7 @@ # OS: ubuntu windowsservercore-1809 windowsservercore-ltsc2016 -Versions: 8 11 14 15 +Versions: 8 11 14 15 16 Build: releases Type: full @@ -218,3 +218,45 @@ Build: releases Type: full Architectures: windows-nano Directory: 15/jre/windows/nanoserver-1809 + +###################################################################### + +Build: releases +Type: full +Architectures: x86_64 ppc64le s390x +Directory: 16/jdk/ubuntu + +Build: releases +Type: full +Architectures: windows-amd +Directory: 16/jdk/windows/windowsservercore-1809 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 16/jdk/windows/windowsservercore-ltsc2016 + +Build: releases +Type: full +Architectures: windows-nano +Directory: 16/jdk/windows/nanoserver-1809 + +Build: releases +Type: full +Architectures: x86_64 ppc64le s390x +Directory: 16/jre/ubuntu + +Build: releases +Type: full +Architectures: windows-amd +Directory: 16/jre/windows/windowsservercore-1809 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 16/jre/windows/windowsservercore-ltsc2016 + +Build: releases +Type: full +Architectures: windows-nano +Directory: 16/jre/windows/nanoserver-1809 From d4347a72509d7ab05aba49864d7b0f7e22791e58 Mon Sep 17 00:00:00 2001 From: Dinakar Guniguntala Date: Wed, 17 Mar 2021 17:16:20 +0530 Subject: [PATCH 2/4] Fix common_functions.sh for 16 --- common_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common_functions.sh b/common_functions.sh index f33b1c4dd..cff4702d2 100755 --- a/common_functions.sh +++ b/common_functions.sh @@ -52,7 +52,7 @@ PR_TEST_OSES="ubuntu alpine ubi" runtype="build" # Current JVM versions supported -export supported_versions="16" +export supported_versions="8 11 14 15 16" export latest_version="16" # Current builds supported From 17bd836bfa0ccb5cd3a85391104db79a185e93fa Mon Sep 17 00:00:00 2001 From: Dinakar Guniguntala Date: Wed, 17 Mar 2021 17:20:17 +0530 Subject: [PATCH 3/4] Update non-official config for java 16. --- config/hotspot.config | 164 +++++++++++++++++++++++++++++++++++++++++- config/openj9.config | 164 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 326 insertions(+), 2 deletions(-) diff --git a/config/hotspot.config b/config/hotspot.config index f464c1859..ae2d3f7c0 100644 --- a/config/hotspot.config +++ b/config/hotspot.config @@ -13,7 +13,7 @@ # OS: alpine debian debianslim ubi ubi-minimal centos clefos ubuntu leap tumbleweed windowsservercore-1809 windowsservercore-ltsc2016 nanoserver-1809 windowsservercore-1909 windowsservercore-ltsc2019 nanoserver-1909 -Versions: 8 11 14 15 +Versions: 8 11 14 15 16 Build: releases nightly Type: full slim @@ -598,3 +598,165 @@ Build: nightly Type: full slim Architectures: windows-nano Directory: 15/jre/windows/nanoserver-1909 + +############################################################################### + +Build: releases nightly +Type: full slim +Architectures: x86_64 +Directory: 16/jdk/alpine + +Build: releases nightly +Type: full slim +Architectures: aarch64 armv7l x86_64 ppc64le s390x +Directory: 16/jdk/debian + +Build: releases nightly +Type: full slim +Architectures: aarch64 armv7l x86_64 ppc64le s390x +Directory: 16/jdk/debianslim + +Build: releases nightly +Type: full slim +Architectures: aarch64 x86_64 ppc64le s390x +Directory: 16/jdk/ubi + +Build: releases nightly +Type: full +Architectures: aarch64 x86_64 ppc64le s390x +Directory: 16/jdk/ubi-minimal + +Build: releases nightly +Type: full slim +Architectures: aarch64 armv7l x86_64 ppc64le +Directory: 16/jdk/centos + +Build: releases nightly +Type: full slim +Architectures: s390x +Directory: 16/jdk/clefos + +Build: releases nightly +Type: full +Architectures: aarch64 armv7l x86_64 ppc64le +Directory: 16/jdk/leap + +Build: releases nightly +Type: full +Architectures: aarch64 armv7l x86_64 ppc64le s390x +Directory: 16/jdk/tumbleweed + +Build: releases nightly +Type: full slim +Architectures: aarch64 armv7l x86_64 ppc64le s390x +Directory: 16/jdk/ubuntu + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jdk/windows/windowsservercore-1809 + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jdk/windows/windowsservercore-ltsc2016 + +Build: nightly +Type: full slim +Architectures: windows-nano +Directory: 16/jdk/windows/nanoserver-1809 + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jdk/windows/windowsservercore-1909 + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jdk/windows/windowsservercore-ltsc2019 + +Build: nightly +Type: full slim +Architectures: windows-nano +Directory: 16/jdk/windows/nanoserver-1909 + +Build: releases nightly +Type: full +Architectures: x86_64 +Directory: 16/jre/alpine + +Build: releases nightly +Type: full +Architectures: aarch64 armv7l x86_64 ppc64le s390x +Directory: 16/jre/debian + +Build: releases nightly +Type: full +Architectures: aarch64 armv7l x86_64 ppc64le s390x +Directory: 16/jre/debianslim + +Build: releases nightly +Type: full +Architectures: aarch64 x86_64 ppc64le s390x +Directory: 16/jre/ubi + +Build: releases nightly +Type: full +Architectures: aarch64 x86_64 ppc64le s390x +Directory: 16/jre/ubi-minimal + +Build: releases nightly +Type: full +Architectures: aarch64 armv7l x86_64 ppc64le +Directory: 16/jre/centos + +Build: releases nightly +Type: full +Architectures: s390x +Directory: 16/jre/clefos + +Build: releases nightly +Type: full +Architectures: aarch64 armv7l x86_64 ppc64le +Directory: 16/jre/leap + +Build: releases nightly +Type: full +Architectures: aarch64 armv7l x86_64 ppc64le s390x +Directory: 16/jre/tumbleweed + +Build: releases nightly +Type: full +Architectures: aarch64 armv7l x86_64 ppc64le s390x +Directory: 16/jre/ubuntu + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jre/windows/windowsservercore-1809 + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jre/windows/windowsservercore-ltsc2016 + +Build: nightly +Type: full slim +Architectures: windows-nano +Directory: 16/jre/windows/nanoserver-1809 + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jre/windows/windowsservercore-1909 + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jre/windows/windowsservercore-ltsc2019 + +Build: nightly +Type: full slim +Architectures: windows-nano +Directory: 16/jre/windows/nanoserver-1909 diff --git a/config/openj9.config b/config/openj9.config index 8a2a34fdf..39ded8d42 100644 --- a/config/openj9.config +++ b/config/openj9.config @@ -15,7 +15,7 @@ # and pushed to the https://hub.docker.com/u/adoptopenjdk repo OS: alpine debian debianslim ubi ubi-minimal centos clefos ubuntu leap tumbleweed windowsservercore-1809 windowsservercore-ltsc2016 nanoserver-1809 windowsservercore-1909 windowsservercore-ltsc2019 nanoserver-1909 -Versions: 8 11 14 15 +Versions: 8 11 14 15 16 Build: releases nightly Type: full slim @@ -600,3 +600,165 @@ Build: nightly Type: full slim Architectures: windows-nano Directory: 15/jre/windows/nanoserver-1909 + +###################################################################### + +Build: releases nightly +Type: full slim +Architectures: x86_64 +Directory: 16/jdk/alpine + +Build: releases nightly +Type: full slim +Architectures: x86_64 ppc64le s390x +Directory: 16/jdk/debian + +Build: releases nightly +Type: full slim +Architectures: x86_64 ppc64le s390x +Directory: 16/jdk/debianslim + +Build: releases nightly +Type: full slim +Architectures: x86_64 ppc64le s390x +Directory: 16/jdk/ubi + +Build: releases nightly +Type: full +Architectures: x86_64 ppc64le s390x +Directory: 16/jdk/ubi-minimal + +Build: releases nightly +Type: full slim +Architectures: x86_64 ppc64le +Directory: 16/jdk/centos + +Build: releases nightly +Type: full slim +Architectures: s390x +Directory: 16/jdk/clefos + +Build: releases nightly +Type: full +Architectures: x86_64 ppc64le +Directory: 16/jdk/leap + +Build: releases nightly +Type: full +Architectures: x86_64 ppc64le s390x +Directory: 16/jdk/tumbleweed + +Build: releases nightly +Type: full slim +Architectures: x86_64 ppc64le s390x +Directory: 16/jdk/ubuntu + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jdk/windows/windowsservercore-1809 + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jdk/windows/windowsservercore-ltsc2016 + +Build: nightly +Type: full slim +Architectures: windows-nano +Directory: 16/jdk/windows/nanoserver-1809 + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jdk/windows/windowsservercore-1909 + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jdk/windows/windowsservercore-ltsc2019 + +Build: nightly +Type: full slim +Architectures: windows-nano +Directory: 16/jdk/windows/nanoserver-1909 + +Build: releases nightly +Type: full +Architectures: x86_64 +Directory: 16/jre/alpine + +Build: releases nightly +Type: full +Architectures: x86_64 ppc64le s390x +Directory: 16/jre/debian + +Build: releases nightly +Type: full +Architectures: x86_64 ppc64le s390x +Directory: 16/jre/debianslim + +Build: releases nightly +Type: full +Architectures: x86_64 ppc64le s390x +Directory: 16/jre/ubi + +Build: releases nightly +Type: full +Architectures: x86_64 ppc64le s390x +Directory: 16/jre/ubi-minimal + +Build: releases nightly +Type: full +Architectures: x86_64 ppc64le +Directory: 16/jre/centos + +Build: releases nightly +Type: full +Architectures: s390x +Directory: 16/jre/clefos + +Build: releases nightly +Type: full +Architectures: x86_64 ppc64le +Directory: 16/jre/leap + +Build: releases nightly +Type: full +Architectures: x86_64 ppc64le s390x +Directory: 16/jre/tumbleweed + +Build: releases nightly +Type: full +Architectures: x86_64 ppc64le s390x +Directory: 16/jre/ubuntu + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jre/windows/windowsservercore-1809 + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jre/windows/windowsservercore-ltsc2016 + +Build: nightly +Type: full slim +Architectures: windows-nano +Directory: 16/jre/windows/nanoserver-1809 + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jre/windows/windowsservercore-1909 + +Build: nightly +Type: full +Architectures: windows-amd +Directory: 16/jre/windows/windowsservercore-ltsc2019 + +Build: nightly +Type: full slim +Architectures: windows-nano +Directory: 16/jre/windows/nanoserver-1909 From 71fee28a1b5ffed7f3a7bd8472b730ec5418d05a Mon Sep 17 00:00:00 2001 From: Dinakar Guniguntala Date: Wed, 17 Mar 2021 17:23:49 +0530 Subject: [PATCH 4/4] Add Java 16 to git workflow for PR checks. --- .github/workflows/continuous-integration-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 28351ba89..b10959d9b 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [windows-2016, windows-2019, ubuntu-20.04] - version: [8, 11, 14, 15] + version: [8, 11, 15, 16] vm: [hotspot, openj9] package: [jdk, jre] runtype: [test]