Merge pull request #19 from adriaanm/issue4-multi-jdk

Fix #4: multiple JDKs

Author: adriaanm

files/default/jvm-select-common

@@ -0,0 +1,6 @@
+function jvmSelectCommon(){
+  javaHome="/usr/lib/jvm/java-$versionPrefix$version$versionSuffix-$flavor$archSuffix"
+  $javaHome/bin/java -version 2>&1 | grep "version.*1.$version.0" || (echo "Failed to locate $flavor Java $version. Available JVMs:"; find /usr/lib/jvm/ -name "java-*$archSuffix" ; exit 1)
+  export JAVA_HOME=$javaHome
+  export PATH="$JAVA_HOME/bin:$PATH"
+}

files/rhel/jvm-select

@@ -0,0 +1,12 @@
+source /usr/local/share/jvm/jvm-select-common
+
+# configure naming for YUMmy distros
+function jvmSelect(){
+  flavor=$1
+  version=$2
+  arch=${3-$(arch)}
+  archSuffix=".$arch"
+  versionPrefix="1."
+  versionSuffix=".0"
+  jvmSelectCommon
+}

files/ubuntu/jvm-select

@@ -0,0 +1,12 @@
+source /usr/local/share/jvm/jvm-select-common
+
+# configure naming for debian-based distros
+function jvmSelect(){
+  flavor=$1
+  version=$2
+  arch=${3-amd64}
+  archSuffix="-$arch"
+  versionPrefix=""
+  versionSuffix=""
+  jvmSelectCommon
+}

libraries/job_blurbs.rb

@@ -74,6 +74,18 @@ def githubProject(options = {})
       timeoutMinutesElasticDefault = options.fetch(:timeoutMinutesElasticDefault, 150)
       buildNameScript = options.fetch(:buildNameScript, setBuildNameScript)
 
+      jvmFlavor  = options[:jvmFlavor]
+      jvmVersion = options[:jvmVersion]
+      jvmSelectScript = ""
+
+      if jvmFlavor && jvmVersion
+        params.concat([
+          {:name => "jvmFlavor",  :default => jvmFlavor,  :desc => "Java flavor to use (oracle/openjdk)."},
+          {:name => "jvmVersion", :default => jvmVersion, :desc => "Java version to use (6/7/8)."}
+        ])
+        jvmSelectScript=jvmSelect
+      end
+
       restriction =
       """<assignedNode>%{nodes}</assignedNode>
       <canRoam>false</canRoam>""".gsub(/      /, '')
@@ -90,6 +102,7 @@ def env(name)
         <concurrentBuild>#{concurrent}</concurrentBuild>
         <builders>
           #{groovySysScript(buildNameScript)}
+          #{jvmSelectScript}
           #{scriptBuild}
         </builders>
         <buildWrappers>
@@ -138,6 +151,17 @@ def job(name)
       versionedJob(@version, name)
     end
 
+    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
       <<-EOH.gsub(/^      /, '')
       <hudson.tasks.Shell>

recipes/worker-init.rb

@@ -18,3 +18,15 @@
 include_recipe "sbt-extras" unless platform_family?("windows")
 
 include_recipe "scala-jenkins-infra::_worker-init-#{node["platform_family"]}"
+
+directory "/usr/local/share/jvm/" do
+  mode '755'
+  recursive true
+end
+
+%w{jvm-select jvm-select-common}.each do |f|
+  cookbook_file f do
+    mode '755'
+    path "/usr/local/share/jvm/#{f}"
+  end
+end

templates/default/jobs/integrate/bootstrap.xml.erb

@@ -14,6 +14,8 @@
     <p> Use github.com/scala/make-release-notes to build the release notes.
    }.gsub(/^    /, ''),
   nodeRestriction: "linux && publish",
+  jvmVersion: 6,
+  jvmFlavor:  "oracle",
   params: [
     {:name => "SCALA_VER_BASE",
      :desc => "Specifying this parameter will cause a release to be built. If it&apos;s empty (and HEAD does not have a tag that parses as a version), a -nightly release is built."},