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.

Sign up for GitHub

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

Jump to bottom

Change from JAVA_VERSION to JDK_VERSION #4951

Merged
merged 1 commit into from Mar 5, 2019
Merged

Change from JAVA_VERSION to JDK_VERSION #4951

merged 1 commit into from Mar 5, 2019

Conversation

AdamBrousseau
Copy link
Contributor

@AdamBrousseau AdamBrousseau commented Mar 1, 2019 •
edited

  • Also set next to version 13

[skip ci]
Issue #4936

Signed-off-by: Adam Brousseau adam.brousseau88@gmail.com

@AdamBrousseau AdamBrousseau mentioned this pull request Mar 4, 2019
Closed
@AdamBrousseau AdamBrousseau changed the title echo sdk and java version [skip ci] Change from JAVA_VERSION to JDK_VERSION Mar 4, 2019
@AdamBrousseau AdamBrousseau force-pushed the echo_java_version branch 2 times, most recently from cc69520 to 8febad2 Compare March 4, 2019 16:58
@AdamBrousseau
Copy link
Contributor Author

Jenkins test sanity plinux jdk11,jdknext

@AdamBrousseau
Copy link
Contributor Author

AdamBrousseau commented Mar 4, 2019 •
edited

https://ci.eclipse.org/openj9/job/PullRequest-Sanity-JDK11-linux_ppc-64_cmprssptrs_le-OpenJ9/268/

00:29:27.975  + make -f run_configure.mk
00:29:27.976  perl configure.pl
00:29:27.976  cd /home/jenkins/jenkins-agent/workspace/PullRequest-Sanity-JDK11-linux_ppc-64_cmprssptrs_le-OpenJ9/openj9/test/TestConfig/scripts/testKitGen; \
00:29:27.976  perl testKitGen.pl --graphSpecs=linux_ppc-64_cmprssptrs_le --jdkVersion=11 --impl=openj9 --buildList= --iterations=1 --testFlag= ;

https://ci.eclipse.org/openj9/job/PullRequest-Sanity-JDKnext-linux_ppc-64_cmprssptrs_le-OpenJ9/9

00:32:07.222  + make -f run_configure.mk
00:32:07.222  perl configure.pl
00:32:07.222  cd /home/jenkins/workspace/PullRequest-Sanity-JDKnext-linux_ppc-64_cmprssptrs_le-OpenJ9/openj9/test/TestConfig/scripts/testKitGen; \
00:32:07.222  perl testKitGen.pl --graphSpecs=linux_ppc-64_cmprssptrs_le --jdkVersion=13 --impl=openj9 --buildList= --iterations=1 --testFlag= ;

@AdamBrousseau AdamBrousseau marked this pull request as ready for review March 4, 2019 17:33
@AdamBrousseau
Copy link
Contributor Author

@llxia for review

llxia
llxia reviewed Mar 4, 2019
View reviewed changes
buildenv/jenkins/common/variables-functions Outdated
}
JDK_VERSION = (JDK_VERSION == 'next') ? '13' : JDK_VERSION
Copy link
Contributor

Choose a reason for hiding this comment

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

Since PR #4843 is merged, we do not need to set JDK_VERSION anymore (AUTO_DETECT is on by default).

I think we can do:

JDK_VERSION = (JDK_VERSION == 'next') ? '' : JDK_VERSION

Could you run a personal build to confirm?

@AdamBrousseau
Copy link
Contributor Author

Jenkins test sanity plinux jdk11,jdknext

@AdamBrousseau
Copy link
Contributor Author

https://ci.eclipse.org/openj9/job/PullRequest-Sanity-JDKnext-linux_ppc-64_cmprssptrs_le-OpenJ9/10/

15:51:36  + make -f run_configure.mk
15:51:36  AUTO_DETECT is turned on
...
15:51:40  perl configure.pl
15:51:41  cd /home/jenkins/workspace/PullRequest-Sanity-JDKnext-linux_ppc-64_cmprssptrs_le-OpenJ9/openj9/test/TestConfig/scripts/testKitGen; \
15:51:41  perl testKitGen.pl --graphSpecs=linux_ppc-64_cmprssptrs_le --jdkVersion=13 --impl=openj9 --buildList= --iterations=1 --testFlag= ;

https://ci.eclipse.org/openj9/job/PullRequest-Sanity-JDK11-linux_ppc-64_cmprssptrs_le-OpenJ9/269/

15:53:03  + make -f run_configure.mk
15:53:03  AUTO_DETECT is turned on
...
15:53:12  perl configure.pl
15:53:13  cd /home/jenkins/workspace/PullRequest-Sanity-JDK11-linux_ppc-64_cmprssptrs_le-OpenJ9/openj9/test/TestConfig/scripts/testKitGen; \
15:53:13  perl testKitGen.pl --graphSpecs=linux_ppc-64_cmprssptrs_le --jdkVersion=11 --impl=openj9 --buildList= --iterations=1 --testFlag= ;

Appears to work after I remove all the JDK_VERSION code. Once we switch PR pipelines in 2836 we will be able to support Valhalla as well (#4719). @llxia if you're happy with the change I will squash & repush.

@AdamBrousseau
Remove JAVA_VERSION as Test no longer supports
eff777e 
- JAVA_VERSION was replaced with JDK_VERSION
- Autodetect now allows us to not pass either variable

[skip ci]
Issue eclipse-openj9#4936

Signed-off-by: Adam Brousseau <adam.brousseau88@gmail.com>
llxia
llxia approved these changes Mar 5, 2019
View reviewed changes
Copy link
Contributor

@llxia llxia left a comment

Choose a reason for hiding this comment

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

LGTM

@llxia llxia merged commit 1bb5803 into eclipse-openj9:master Mar 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@llxia llxia llxia approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@AdamBrousseau @llxia