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

Java11 updates #483

Merged
merged 26 commits into from
Jul 23, 2018
Merged

Java11 updates #483

merged 26 commits into from
Jul 23, 2018

Conversation

smlambert
Copy link
Contributor

  • updates to enable Java11 testing

Signed-off-by: smlambert <[email protected]>
@smlambert smlambert requested a review from llxia July 19, 2018 22:08
Set parameter TARGET(openjdk, system, external, perf, jck etc.).
Set UPSTREAM_JOB_NAME(version_build_arch_os, for example: openjdk8_build_x86-64_linux)
Set JVM_VERSION(openjdk8, openjdk8-openj9, openjdk9, openjdk9-openj9, etc.*/
LABEL='sw.os.linux&&hw.arch.ppcle'
Copy link
Contributor

Choose a reason for hiding this comment

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

should this be sw.os.linux&&hw.arch.ppc64le?

@@ -0,0 +1,22 @@
#!groovy
/* Template for test jobs on openjdk8 linux. Configure test job as parameterized.
Copy link
Contributor

Choose a reason for hiding this comment

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

This is comment should be removed as the file is not java version specific anymore.

Same issue in the rest of Jenkins file comments.

Signed-off-by: smlambert <[email protected]>
Signed-off-by: smlambert <[email protected]>
Signed-off-by: smlambert <[email protected]>
Signed-off-by: smlambert <[email protected]>
Signed-off-by: smlambert <[email protected]>
Signed-off-by: smlambert <[email protected]>
Signed-off-by: smlambert <[email protected]>
@smlambert smlambert changed the title WIP: Java11 updates Java11 updates Jul 20, 2018
@@ -26,10 +25,15 @@ def stageTestBinaries() {
}

def setupEnv() {
// env.JAVA_VERSION = "${getJavaVersionFromJvmVersion()}"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Leaving this as comment, as I wish to return to it next week in a separate PR

@@ -0,0 +1,18 @@
#!groovy
LABEL='hw.arch.x86&&sw.os.win'
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we use sw.os.windows according to adoptium/infrastructure#93?
Eclipse OpenJ9 is already updated to use sw.os.windows

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes we should use sw.os.windows, I will update and merge. Thanks!

@llxia
Copy link
Contributor

llxia commented Jul 22, 2018

Approve the change so we can get generic files in. wins file is not used in Eclipse Openj9, so it can be addressed later.

Signed-off-by: smlambert <[email protected]>
@smlambert smlambert merged commit 5151d48 into adoptium:master Jul 23, 2018
@sophia-guo
Copy link
Contributor

When merged all existing jobs will need to update configuration with right jenkins file name. I will first try to update regression test jobs.
Question is when the comment of // env.JAVA_VERSION = "${getJavaVersionFromJvmVersion()}" will be removed? Otherwise all test jobs will need one more extra parameter JAVA_VERSION

@smlambert
Copy link
Contributor Author

smlambert commented Jul 23, 2018

Since I have not removed any of the versioned data jenkinsfiles, all the old builds will work as is (using the old files).

We decided to push this in now, before the getJavaVersionFromJvmVersion() method is completely working, but I left the commented line in, as I plan to return to it this week, because then we could remove all of the versioned data jenkinsfiles and not have to make any updates to job config.

@smlambert smlambert deleted the java11Updates branch July 25, 2018 03:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants