Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing and useful information to "release" file #2049

Merged
merged 4 commits into from
Sep 11, 2020

Conversation

austin0
Copy link
Contributor

@austin0 austin0 commented Sep 2, 2020

Adds the following information the the release file:

Signed-off-by: Austin Bailey Austin.Bailey@ibm.com

@austin0 austin0 force-pushed the fix_AddBuildNumber branch 4 times, most recently from 548036d to 1ea6716 Compare September 7, 2020 10:28
@austin0
Copy link
Contributor Author

austin0 commented Sep 7, 2020

Here is what the release file looks like as a result of this PR:

  • jdk8u Aarch64 Hotspot
JAVA_VERSION="1.8.0_272"
OS_NAME="Linux"
OS_VERSION="2.6"
OS_ARCH="aarch64"
SOURCE=" .:OpenJDK: e2302e6ba1:"
IMPLEMENTOR="AdoptOpenJDK"
BUILD_SOURCE="git:1ea6716f"
FULL_VERSION="1.8.0_272-202009071040-b05"
BUILD_INFO="OS: Linux Version: 4.15.0-1054-aws"
JVM_VARIANT="Hotspot"
JVM_VERSION="25.272-b05"
  • jdk8u Linux x64 OpenJ9
JAVA_VERSION="1.8.0_272"
OS_NAME="Linux"
OS_VERSION="2.6"
OS_ARCH="amd64"
SOURCE=" .:OpenJDK: 3e4761ca:OpenJ9: 97a23460b:OMR: 4cf5d2b60:"
IMPLEMENTOR="AdoptOpenJDK"
BUILD_SOURCE="git:1ea6716f"
FULL_VERSION="1.8.0_272-202009071044-b06"
BUILD_INFO="OS: Linux Version: 4.15.0-1093-azure"
JVM_VARIANT="Openj9"
JVM_VERSION="master-97a23460b"
HEAP_SIZE="Standard"
OPENJ9_TAG="openj9-0.22.0-m1"
  • jdk8u Windows Hotspot
JAVA_VERSION="1.8.0_272"
OS_NAME="Windows"
OS_VERSION="5.2"
OS_ARCH="amd64"
SOURCE=" .:OpenJDK: 603409165e:"
IMPLEMENTOR="AdoptOpenJDK"
BUILD_SOURCE="git:1ea6716f"
FULL_VERSION="1.8.0_272-202009071032-b06"
BUILD_INFO="OS: Windows Server 2012 R2 Version: 6.3"
JVM_VARIANT="Hotspot"
JVM_VERSION="25.272-b06"
  • jdk11u Mac Hotspot
IMPLEMENTOR="AdoptOpenJDK"
IMPLEMENTOR_VERSION="AdoptOpenJDK"
JAVA_VERSION="11.0.9"
JAVA_VERSION_DATE="2020-10-20"
MODULES="java.base java.compiler java.datatransfer java.xml java.prefs java.desktop java.instrument java.logging java.management java.security.sasl java.naming java.rmi java.management.rmi java.net.http java.scripting java.security.jgss java.transaction.xa java.sql java.sql.rowset java.xml.crypto java.se java.smartcardio jdk.accessibility jdk.internal.vm.ci jdk.management jdk.unsupported jdk.internal.vm.compiler jdk.aot jdk.internal.jvmstat jdk.attach jdk.charsets jdk.compiler jdk.crypto.ec jdk.crypto.cryptoki jdk.dynalink jdk.internal.ed jdk.editpad jdk.hotspot.agent jdk.httpserver jdk.internal.le jdk.internal.opt jdk.internal.vm.compiler.management jdk.jartool jdk.javadoc jdk.jcmd jdk.management.agent jdk.jconsole jdk.jdeps jdk.jdwp.agent jdk.jdi jdk.jfr jdk.jlink jdk.jshell jdk.jsobject jdk.jstatd jdk.localedata jdk.management.jfr jdk.naming.dns jdk.naming.ldap jdk.naming.rmi jdk.net jdk.pack jdk.rmic jdk.scripting.nashorn jdk.scripting.nashorn.shell jdk.sctp jdk.security.auth jdk.security.jgss jdk.unsupported.desktop jdk.xml.dom jdk.zipfs"
OS_ARCH="x86_64"
OS_NAME="Darwin"
SOURCE=".:git:f735f93d7217"
BUILD_SOURCE="git:1ea6716f"
FULL_VERSION="11.0.9+6-202009071057"
BUILD_INFO="OS: Mac OS X Version: 10.14.6 18G84"
JVM_VARIANT="Hotspot"
JVM_VERSION="11.0.9+6-202009071057"
  • jdk11u Linux x64 OpenJ9
IMPLEMENTOR="Eclipse OpenJ9"
IMPLEMENTOR_VERSION="AdoptOpenJDK"
JAVA_VERSION="11.0.9"
JAVA_VERSION_DATE="2020-10-20"
MODULES="java.base java.compiler java.datatransfer java.xml java.prefs java.desktop java.instrument java.logging java.management java.security.sasl java.naming java.rmi java.management.rmi java.net.http java.scripting java.security.jgss java.transaction.xa java.sql java.sql.rowset java.xml.crypto java.se java.smartcardio jdk.accessibility jdk.internal.jvmstat jdk.attach jdk.charsets jdk.compiler jdk.crypto.ec jdk.crypto.cryptoki jdk.dynalink jdk.internal.ed jdk.editpad jdk.httpserver jdk.internal.le jdk.internal.opt jdk.jartool jdk.javadoc jdk.jcmd jdk.management jdk.management.agent jdk.jconsole jdk.jdeps jdk.jdwp.agent jdk.jdi jdk.jlink jdk.jshell jdk.jsobject jdk.localedata jdk.naming.dns jdk.naming.rmi jdk.net jdk.pack jdk.rmic jdk.scripting.nashorn jdk.scripting.nashorn.shell jdk.sctp jdk.security.auth jdk.security.jgss jdk.unsupported jdk.unsupported.desktop jdk.xml.dom jdk.zipfs openj9.cuda openj9.dataaccess openj9.traceformat openj9.dtfj openj9.dtfjview openj9.gpu openj9.jvm openj9.sharedclasses openj9.zosconditionhandling"
OS_ARCH="x86_64"
OS_NAME="Linux"
SOURCE="OpenJDK:5c901dad28 OpenJ9:97a23460b OMR:4cf5d2b60"
BUILD_SOURCE="git:1ea6716f"
FULL_VERSION="11.0.9+5-202009071047"
BUILD_INFO="OS: Linux Version: 4.15.0-1093-azure"
JVM_VARIANT="Openj9"
JVM_VERSION="master-97a23460b"
HEAP_SIZE="Standard"
OPENJ9_TAG="openj9-0.22.0-m1"
  • jdk16 Linux x64 Hotspot
IMPLEMENTOR="AdoptOpenJDK"
IMPLEMENTOR_VERSION="AdoptOpenJDK"
JAVA_VERSION="16"
JAVA_VERSION_DATE="2021-03-16"
MODULES="java.base java.compiler java.datatransfer java.xml java.prefs java.desktop java.instrument java.logging java.management java.security.sasl java.naming java.rmi java.management.rmi java.net.http java.scripting java.security.jgss java.transaction.xa java.sql java.sql.rowset java.xml.crypto java.se java.smartcardio jdk.accessibility jdk.internal.vm.ci jdk.management jdk.unsupported jdk.internal.vm.compiler jdk.aot jdk.internal.jvmstat jdk.attach jdk.charsets jdk.compiler jdk.crypto.ec jdk.crypto.cryptoki jdk.dynalink jdk.internal.ed jdk.editpad jdk.hotspot.agent jdk.httpserver jdk.incubator.foreign jdk.internal.opt jdk.jdeps jdk.jlink jdk.incubator.jpackage jdk.internal.le jdk.internal.vm.compiler.management jdk.jartool jdk.javadoc jdk.jcmd jdk.management.agent jdk.jconsole jdk.jdwp.agent jdk.jdi jdk.jfr jdk.jshell jdk.jsobject jdk.jstatd jdk.localedata jdk.management.jfr jdk.naming.dns jdk.naming.rmi jdk.net jdk.nio.mapmode jdk.sctp jdk.security.auth jdk.security.jgss jdk.unsupported.desktop jdk.xml.dom jdk.zipfs"
OS_ARCH="x86_64"
OS_NAME="Linux"
SOURCE=".:git:888786bfe848"
BUILD_SOURCE="git:1ea6716f"
FULL_VERSION="16+13-202009071043"
BUILD_INFO="OS: Linux Version: 4.15.0-1093-azure"
JVM_VARIANT="Hotspot"
JVM_VERSION="16+13-202009071043"
  • jdk16 Linux x64 OpenJ9
IMPLEMENTOR="AdoptOpenJDK"
IMPLEMENTOR_VERSION="AdoptOpenJDK"
JAVA_VERSION="16"
JAVA_VERSION_DATE="2021-03-16"
MODULES="java.base java.compiler java.datatransfer java.xml java.prefs java.desktop java.instrument java.logging java.management java.security.sasl java.naming java.rmi java.management.rmi java.net.http java.scripting java.security.jgss java.transaction.xa java.sql java.sql.rowset java.xml.crypto java.se java.smartcardio jdk.accessibility jdk.internal.jvmstat jdk.attach jdk.charsets jdk.compiler jdk.crypto.ec jdk.crypto.cryptoki jdk.dynalink jdk.internal.ed jdk.editpad jdk.httpserver jdk.incubator.foreign jdk.internal.opt jdk.jdeps jdk.jlink jdk.incubator.jpackage jdk.internal.le jdk.jartool jdk.javadoc jdk.jcmd jdk.management jdk.management.agent jdk.jconsole jdk.jdwp.agent jdk.jdi jdk.jshell jdk.jsobject jdk.localedata jdk.naming.dns jdk.naming.rmi jdk.net jdk.nio.mapmode jdk.sctp jdk.security.auth jdk.security.jgss jdk.unsupported jdk.unsupported.desktop jdk.xml.dom jdk.zipfs openj9.cuda openj9.dataaccess openj9.traceformat openj9.dtfj openj9.dtfjview openj9.gpu openj9.jvm openj9.sharedclasses openj9.zosconditionhandling"
OS_ARCH="x86_64"
OS_NAME="Linux"
SOURCE="OpenJDK:9c2ab6c260 OpenJ9:97a23460b OMR:4cf5d2b60"
BUILD_SOURCE="git:1ea6716f"
FULL_VERSION="16+13-202009071047"
BUILD_INFO="OS: Linux Version: 4.15.0-1093-azure"
JVM_VARIANT="Openj9"
JVM_VERSION="master-97a23460b"
HEAP_SIZE="Standard"
OPENJ9_TAG="openj9-0.22.0-m1"

@austin0 austin0 marked this pull request as ready for review September 7, 2020 14:08
sbin/build.sh Outdated Show resolved Hide resolved
@aahlenst
Copy link
Contributor

aahlenst commented Sep 7, 2020

@tushev Is that enough information for your use cases?

@tushev
Copy link

tushev commented Sep 7, 2020

@aahlenst For hotspot/openj9, everything looks great with JVM_VARIANT.

For build - version info is still distributed and non-consistent across various branches, e.g. "16+13-202009071047" vs "1.8.0_272-202009071032-b06" vs "11.0.9+6-202009071057" (and I guess it may be changed in future).

I would prefer something like SEMANTIC_VERSION = "11.0.8+10" - already present in your API and consistent across all Feature versions. This will make the code more robust and maintainable. Could you please add this line as well?

@austin0
Copy link
Contributor Author

austin0 commented Sep 7, 2020

Will start working the requested changes, shouldn't take too much effort 👍

@tushev
Copy link

tushev commented Sep 8, 2020

@austin0 @aahlenst Just encountered another issue (not sure if I should create standalone issue here on GitHub)

Is it possible to add IMAGE_TYPE="JRE" or IMAGE_TYPE="JDK", please?


Yes, I know I can distinguish JDK and JRE easily by looking up the registry (not available for unzipped distributions) or by calling java -version (which is quite time-consuming if I have to check several installations).

As I just figured out, it's unsafe to rely on presence of javac.exe, because it can be found in 14 JRE:
image
So having an independent flag in release file will simplify things a bit.

@austin0
Copy link
Contributor Author

austin0 commented Sep 8, 2020

@tushev IMAGE_TYPE and SEMANTIC_VERSION added, just waiting for decision on IMPLEMENTOR then it should be good to go.

@austin0
Copy link
Contributor Author

austin0 commented Sep 9, 2020

@tushev

  • jdk8u
JAVA_VERSION="1.8.0_272"
OS_NAME="Windows"
OS_VERSION="5.1"
OS_ARCH="i586"
SOURCE=" .:OpenJDK: 7fc0f335d7:"
IMPLEMENTOR="AdoptOpenJDK"
BUILD_SOURCE="git:9f01315"
FULL_VERSION="1.8.0_272-202009091523-b02"
SEMANTIC_VERSION="8.0.272+2"
BUILD_INFO="OS: Windows Server 2016 Version: 10.0"
JVM_VARIANT="Hotspot"
JVM_VERSION="25.272-b02"
IMAGE_TYPE="JDK"
  • jdk11u
IMPLEMENTOR="AdoptOpenJDK"
IMPLEMENTOR_VERSION="AdoptOpenJDK"
JAVA_VERSION="11.0.9"
JAVA_VERSION_DATE="2020-10-20"
MODULES="java.base java.compiler java.datatransfer java.xml java.prefs java.desktop java.instrument java.logging java.management java.security.sasl java.naming java.rmi java.management.rmi java.net.http java.scripting java.security.jgss java.transaction.xa java.sql java.sql.rowset java.xml.crypto java.se java.smartcardio jdk.accessibility jdk.internal.vm.ci jdk.management jdk.unsupported jdk.internal.vm.compiler jdk.aot jdk.internal.jvmstat jdk.attach jdk.charsets jdk.compiler jdk.crypto.ec jdk.crypto.cryptoki jdk.dynalink jdk.internal.ed jdk.editpad jdk.hotspot.agent jdk.httpserver jdk.internal.le jdk.internal.opt jdk.internal.vm.compiler.management jdk.jartool jdk.javadoc jdk.jcmd jdk.management.agent jdk.jconsole jdk.jdeps jdk.jdwp.agent jdk.jdi jdk.jfr jdk.jlink jdk.jshell jdk.jsobject jdk.jstatd jdk.localedata jdk.management.jfr jdk.naming.dns jdk.naming.ldap jdk.naming.rmi jdk.net jdk.pack jdk.rmic jdk.scripting.nashorn jdk.scripting.nashorn.shell jdk.sctp jdk.security.auth jdk.security.jgss jdk.unsupported.desktop jdk.xml.dom jdk.zipfs"
OS_ARCH="x86_64"
OS_NAME="Darwin"
SOURCE=".:git:87660caaa967"
BUILD_SOURCE="git:9db8ea8"
FULL_VERSION="11.0.9+6-202009091522"
SEMANTIC_VERSION="11.0.9+6"
BUILD_INFO="OS: Mac OS X Version: 10.15.6 19G2021"
JVM_VARIANT="Hotspot"
JVM_VERSION="11.0.9+6-202009091522"
IMAGE_TYPE="JDK"
  • jdk16 (this is JDK HEAD so no minor versions in the semver)
IMPLEMENTOR="AdoptOpenJDK"
IMPLEMENTOR_VERSION="AdoptOpenJDK"
JAVA_VERSION="16"
JAVA_VERSION_DATE="2021-03-16"
MODULES="java.base java.compiler java.datatransfer java.xml java.prefs java.desktop java.instrument java.logging java.management java.security.sasl java.naming java.rmi java.management.rmi java.net.http java.scripting java.security.jgss java.transaction.xa java.sql java.sql.rowset java.xml.crypto java.se java.smartcardio jdk.accessibility jdk.internal.jvmstat jdk.attach jdk.charsets jdk.compiler jdk.crypto.ec jdk.crypto.cryptoki jdk.crypto.mscapi jdk.dynalink jdk.internal.ed jdk.editpad jdk.hotspot.agent jdk.httpserver jdk.incubator.foreign jdk.internal.opt jdk.jdeps jdk.jlink jdk.incubator.jpackage jdk.internal.le jdk.jartool jdk.javadoc jdk.jcmd jdk.management jdk.management.agent jdk.jconsole jdk.jdwp.agent jdk.jdi jdk.jfr jdk.jshell jdk.jsobject jdk.jstatd jdk.localedata jdk.management.jfr jdk.naming.dns jdk.naming.rmi jdk.net jdk.nio.mapmode jdk.sctp jdk.security.auth jdk.security.jgss jdk.unsupported jdk.unsupported.desktop jdk.xml.dom jdk.zipfs"
OS_ARCH="x86_64"
OS_NAME="Windows"
SOURCE=".:git:2be74ecc560e"
BUILD_SOURCE="git:9db8ea8"
FULL_VERSION="16+13-202009091417"
SEMANTIC_VERSION="16+13"
BUILD_INFO="OS: Windows Server 2016 Version: 10.0"
JVM_VARIANT="Hotspot"
JVM_VERSION="16+13-202009091417"
IMAGE_TYPE="JDK"

@tushev
Copy link

tushev commented Sep 9, 2020

@austin0 Looks great, thank you very much! 👍

(I guess that HEAP_SIZE appears only when JVM_VARIANT="Openj9")

(this is JDK HEAD so no minor versions in the semver)

Good, will have to tune my parser a little :)

@austin0
Copy link
Contributor Author

austin0 commented Sep 9, 2020

Great, @gdams happy to approve this now?

@gdams
Copy link
Member

gdams commented Sep 9, 2020

@austin0 could you just add the logic that sets VENDOR to be Alibaba for dragonwell? Otherwise, we may cause confusion

Signed-off-by: Austin Bailey <Austin.Bailey@ibm.com>
@gdams
Copy link
Member

gdams commented Sep 10, 2020

conflicts

@adoptopenjdk-github-bot
Copy link
Contributor

🟠 PR TESTER RESULT 🟠

❎ Some pipelines failed or the job was aborted! ❎
See the pipeline-build-check below for more information...

@austin0
Copy link
Contributor Author

austin0 commented Sep 10, 2020

PR Tester finished, one failure: jdk16-aarch64-openj9 jit error.

@andrew-m-leonard could you review this please?

Copy link
Contributor

@andrew-m-leonard andrew-m-leonard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@austin0 austin0 merged commit 4e2f49f into adoptium:master Sep 11, 2020
M-Davies pushed a commit to M-Davies/openjdk-build that referenced this pull request Sep 11, 2020
* Added more information to release file

Signed-off-by: Austin Bailey <Austin.Bailey@ibm.com>
@karianna karianna added the enhancement Issues that enhance the code or documentation of the repo in any way label Sep 15, 2020
@karianna karianna added this to the September 2020 milestone Sep 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Issues that enhance the code or documentation of the repo in any way
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants