From 69d2329c11ca68b7b0d48adbc07a3a1503b91391 Mon Sep 17 00:00:00 2001 From: Alex Earl Date: Mon, 13 Jul 2020 07:26:22 -0700 Subject: [PATCH 1/3] Add 1909 and ltsc2019 to official configs --- config/hotspot-official.config | 122 ++++++++++++++++++++++++++++++++- 1 file changed, 121 insertions(+), 1 deletion(-) diff --git a/config/hotspot-official.config b/config/hotspot-official.config index 11bcc6633..26ecadc43 100644 --- a/config/hotspot-official.config +++ b/config/hotspot-official.config @@ -12,7 +12,7 @@ # limitations under the License. # -OS: ubuntu windowsservercore-1809 windowsservercore-ltsc2016 nanoserver-1809 +OS: ubuntu windowsservercore-1809 windowsservercore-ltsc2016 nanoserver-1809 windowsservercore-1909 windowsservercore-ltsc2019 nanoserver-1909 Versions: 8 11 13 14 Build: releases @@ -35,6 +35,21 @@ Type: full Architectures: windows-nano Directory: 8/jdk/windows/nanoserver-1809 +Build: releases +Type: full +Architectures: windows-amd +Directory: 8/jdk/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 8/jdk/windows/windowsservercore-ltsc2019 + +Build: releases +Type: full +Architectures: windows-nano +Directory: 8/jdk/windows/nanoserver-1909 + Build: releases Type: full Architectures: aarch64 armv7l x86_64 ppc64le s390x @@ -55,6 +70,21 @@ Type: full Architectures: windows-nano Directory: 8/jre/windows/nanoserver-1809 +Build: nightly +Type: full +Architectures: windows-amd +Directory: 8/jre/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 8/jre/windows/windowsservercore-ltsc2019 + +Build: nightly +Type: full +Architectures: windows-nano +Directory: 8/jre/windows/nanoserver-1909 + Build: releases Type: full Architectures: aarch64 armv7l x86_64 ppc64le s390x @@ -75,6 +105,21 @@ Type: full Architectures: windows-nano Directory: 11/jdk/windows/nanoserver-1809 +Build: releases +Type: full +Architectures: windows-amd +Directory: 11/jdk/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 11/jdk/windows/windowsservercore-ltsc2019 + +Build: releases +Type: full +Architectures: windows-nano +Directory: 11/jdk/windows/nanoserver-1909 + Build: releases Type: full Architectures: aarch64 armv7l x86_64 ppc64le s390x @@ -95,6 +140,21 @@ Type: full Architectures: windows-nano Directory: 11/jre/windows/nanoserver-1809 +Build: releases +Type: full +Architectures: windows-amd +Directory: 11/jre/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 11/jre/windows/windowsservercore-ltsc2019 + +Build: releases +Type: full +Architectures: windows-nano +Directory: 11/jre/windows/nanoserver-1909 + Build: releases Type: full Architectures: aarch64 armv7l x86_64 ppc64le s390x @@ -115,6 +175,21 @@ Type: full Architectures: windows-nano Directory: 13/jdk/windows/nanoserver-1809 +Build: releases +Type: full +Architectures: windows-amd +Directory: 13/jdk/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 13/jdk/windows/windowsservercore-ltsc2019 + +Build: releases +Type: full +Architectures: windows-nano +Directory: 13/jdk/windows/nanoserver-1909 + Build: releases Type: full Architectures: aarch64 armv7l x86_64 ppc64le s390x @@ -135,6 +210,21 @@ Type: full Architectures: windows-nano Directory: 13/jre/windows/nanoserver-1809 +Build: releases +Type: full +Architectures: windows-amd +Directory: 13/jre/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 13/jre/windows/windowsservercore-ltsc2019 + +Build: releases +Type: full +Architectures: windows-nano +Directory: 13/jre/windows/nanoserver-1909 + ###################################################################### Build: releases @@ -157,6 +247,21 @@ Type: full Architectures: windows-nano Directory: 14/jdk/windows/nanoserver-1809 +Build: releases +Type: full +Architectures: windows-amd +Directory: 14/jdk/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 14/jdk/windows/windowsservercore-ltsc2019 + +Build: releases +Type: full +Architectures: windows-nano +Directory: 14/jdk/windows/nanoserver-1909 + Build: releases Type: full Architectures: aarch64 armv7l x86_64 ppc64le s390x @@ -176,3 +281,18 @@ Build: releases Type: full Architectures: windows-nano Directory: 14/jre/windows/nanoserver-1809 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 14/jre/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 14/jre/windows/windowsservercore-ltsc2019 + +Build: releases +Type: full +Architectures: windows-nano +Directory: 14/jre/windows/nanoserver-1909 From 51a6a200eae00e9b2b64586f286c21f2ce540fc7 Mon Sep 17 00:00:00 2001 From: Alex Earl Date: Mon, 13 Jul 2020 07:29:51 -0700 Subject: [PATCH 2/3] Update with 1909 and ltsc2019 configs --- config/openj9-official.config | 82 ++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/config/openj9-official.config b/config/openj9-official.config index 52413e899..956568f2d 100644 --- a/config/openj9-official.config +++ b/config/openj9-official.config @@ -12,7 +12,7 @@ # limitations under the License. # -OS: ubuntu windowsservercore-1809 windowsservercore-ltsc2016 +OS: ubuntu windowsservercore-1809 windowsservercore-ltsc2016 windowsservercore-1909 windowsservercore-ltsc2019 Versions: 8 11 13 14 Build: releases @@ -30,6 +30,16 @@ Type: full Architectures: windows-amd Directory: 8/jdk/windows/windowsservercore-ltsc2016 +Build: releases +Type: full +Architectures: windows-amd +Directory: 8/jdk/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 8/jdk/windows/windowsservercore-ltsc2019 + Build: releases Type: full Architectures: x86_64 ppc64le s390x @@ -45,6 +55,16 @@ Type: full Architectures: windows-amd Directory: 8/jre/windows/windowsservercore-ltsc2016 +Build: releases +Type: full +Architectures: windows-amd +Directory: 8/jre/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 8/jre/windows/windowsservercore-ltsc2019 + Build: releases Type: full Architectures: x86_64 ppc64le s390x @@ -60,6 +80,16 @@ Type: full Architectures: windows-amd Directory: 11/jdk/windows/windowsservercore-ltsc2016 +Build: releases +Type: full +Architectures: windows-amd +Directory: 11/jdk/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 11/jdk/windows/windowsservercore-ltsc2019 + Build: releases Type: full Architectures: x86_64 ppc64le s390x @@ -75,6 +105,16 @@ Type: full Architectures: windows-amd Directory: 11/jre/windows/windowsservercore-ltsc2016 +Build: releases +Type: full +Architectures: windows-amd +Directory: 11/jre/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 11/jre/windows/windowsservercore-ltsc2019 + Build: releases Type: full Architectures: x86_64 ppc64le s390x @@ -90,6 +130,16 @@ Type: full Architectures: windows-amd Directory: 13/jdk/windows/windowsservercore-ltsc2016 +Build: releases +Type: full +Architectures: windows-amd +Directory: 13/jdk/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 13/jdk/windows/windowsservercore-ltsc2019 + Build: releases Type: full Architectures: x86_64 ppc64le s390x @@ -105,6 +155,16 @@ Type: full Architectures: windows-amd Directory: 13/jre/windows/windowsservercore-ltsc2016 +Build: releases +Type: full +Architectures: windows-amd +Directory: 13/jre/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 13/jre/windows/windowsservercore-ltsc2019 + ###################################################################### Build: releases @@ -122,6 +182,16 @@ Type: full Architectures: windows-amd Directory: 14/jdk/windows/windowsservercore-ltsc2016 +Build: releases +Type: full +Architectures: windows-amd +Directory: 14/jdk/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 14/jdk/windows/windowsservercore-ltsc2019 + Build: releases Type: full Architectures: x86_64 ppc64le s390x @@ -136,3 +206,13 @@ Build: releases Type: full Architectures: windows-amd Directory: 14/jre/windows/windowsservercore-ltsc2016 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 14/jre/windows/windowsservercore-1909 + +Build: releases +Type: full +Architectures: windows-amd +Directory: 14/jre/windows/windowsservercore-ltsc2019 From 5a17baf8df5b06009163db78ea2327b69ac4d1e7 Mon Sep 17 00:00:00 2001 From: Alex Earl Date: Wed, 21 Oct 2020 08:26:45 -0700 Subject: [PATCH 3/3] Fix typo "jdj" -> "jdk" --- config/openj9-official.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/openj9-official.config b/config/openj9-official.config index 59738b708..ec9511253 100644 --- a/config/openj9-official.config +++ b/config/openj9-official.config @@ -173,7 +173,7 @@ Directory: 13/jdk/windows/windowsservercore-ltsc2016 Build: releases Type: full Architectures: windows-nano -Directory: 13/jdj/windows/nanoserver-1809 +Directory: 13/jdk/windows/nanoserver-1809 Build: releases Type: full