Skip to content

JVM Selection refinements #24

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

Merged
merged 4 commits into from
Feb 5, 2015
Merged

JVM Selection refinements #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db9df58
Rework #19, fix #4: set JAVA_HOME during scriptBuild
adriaanm Jan 30, 2015
bf6ce14
Add JVM selection parameters to PR jobs to retry with alternatives
adriaanm Feb 2, 2015
187c397
behemoth's platform is amazon, not rhel... duh
adriaanm Feb 2, 2015
2742203
Set java_home so that java_ark finds it correctly
adriaanm Feb 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions attributes/worker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@
override['java']['jdk_version'] = '6'
override['java']['install_flavor'] = 'oracle' # partest's javap tests fail on openjdk...
override['java']['oracle']['accept_oracle_download_terms'] = true
# must specify java_home explicitly, or java_ark thinks it's installed even if some other version is...
override['java']['java_home'] = platform_family?('debian') ? '/usr/lib/jvm/java-6-oracle-amd64' : '/usr/lib/jvm/java-1.6.0-oracle.x86_64'

default['graphviz']['url'] = 'https://dl.dropboxusercontent.com/u/12862572/graphviz_2.28.0-1_amd64.deb'
default['graphviz']['checksum'] = '76236edc36d5906b93f35e83f8f19a2045318852d3f826e920f189431967c081'
Expand Down
0 files/rhel/jvm-select → files/amazon/jvm-select
View file
Open in desktop
File renamed without changes.
10 changes: 3 additions & 7 deletions libraries/job_blurbs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ def env(name)
<concurrentBuild>#{concurrent}</concurrentBuild>
<builders>
#{groovySysScript(buildNameScript)}
#{jvmSelectScript}
#{scriptBuild}
#{scriptBuild(jvmSelectScript)}
</builders>
<buildWrappers>
<hudson.plugins.build__timeout.BuildTimeoutWrapper plugin="build-timeout@1.14.1">
Expand Down Expand Up @@ -153,19 +152,16 @@ def job(name)

def jvmSelect
<<-EOH.gsub(/^ /, '')
<hudson.tasks.Shell>
<command>#!/bin/bash -e
source /usr/local/share/jvm/jvm-select
jvmSelect $jvmFlavor $jvmVersion
</command>
</hudson.tasks.Shell>
EOH
end

def scriptBuild
def scriptBuild(setup)
<<-EOH.gsub(/^ /, '')
<hudson.tasks.Shell>
<command>#!/bin/bash -ex
#{setup}
source scripts/#{@scriptName}
</command>
</hudson.tasks.Shell>
Expand Down
2 changes: 1 addition & 1 deletion recipes/_worker-init-rhel.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
# /usr/bin/build-classpath: error: JVM_LIBDIR /usr/lib/jvm-exports/java does not exist or is not a directory
# http://www.karakas-online.de/forum/viewtopic.php?t=9781
# JAVA_HOME=/usr/lib/jvm/java implies there must be a /usr/lib/jvm-exports/java, which is not created by the oracle rpm
directory '/usr/lib/jvm-exports/java'
directory node['java']['java_home'].gsub(/\/usr\/lib\/jvm\//, '/usr/lib/jvm-exports/')
2 changes: 2 additions & 0 deletions templates/default/jobs/validate/publish-core.xml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
{:name => "antBuildArgs", :desc => "TODO"},
{:name => "_scabot_pr", :desc => "For internal use by Scabot."}
],
jvmVersion: 6,
jvmFlavor: "oracle",
buildNameScript: setValidateBuildNameScript)
%>
<publishers>
Expand Down
2 changes: 2 additions & 0 deletions templates/default/jobs/validate/test.xml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
{:name => "testTarget", :desc => "TODO"},
{:name => "_scabot_pr", :desc => "For internal use by Scabot."}
],
jvmVersion: 6,
jvmFlavor: "oracle",
buildNameScript: setValidateBuildNameScript)
%>
<publishers>
Expand Down