Merge pull request travis-ci#61 from loicfrering/master

Working on multi JDK support
loicfrering · May 23, 2012 · e226d9f · e226d9f
2 parents afa31a8 + 4f979c3
commit e226d9f
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 0 deletions.
diff --git a/ci_environment/java/attributes/default.rb b/ci_environment/java/attributes/default.rb
@@ -27,3 +27,5 @@
 else
   set['java']['java_home'] = "/usr/lib/jvm/default-java"
 end
+
+default[:java][:multi][:versions] = ["openjdk6", "openjdk7", "oraclejdk7"]
diff --git a/ci_environment/java/recipes/multi.rb b/ci_environment/java/recipes/multi.rb
@@ -0,0 +1,4 @@
+node['java']['multi']['versions'].each do |java_version|
+  Chef::Log.info("Installing Java #{java_version}.")
+  include_recipe "java::#{java_version}"
+end
diff --git a/ci_environment/java/recipes/openjdk6.rb b/ci_environment/java/recipes/openjdk6.rb
@@ -0,0 +1,17 @@
+version = 6
+
+pkgs = value_for_platform(
+  ["centos","redhat","fedora","scientific","amazon"] => {
+    "default" => ["java-1.#{version}.0-openjdk","java-1.#{version}.0-openjdk-devel"]
+  },
+  ["arch","freebsd"] => {
+    "default" => ["openjdk#{version}"]
+  },
+  "default" => ["openjdk-#{version}-jdk"]
+)
+
+pkgs.each do |pkg|
+  package pkg do
+    action :install
+  end
+end
diff --git a/ci_environment/java/recipes/openjdk7.rb b/ci_environment/java/recipes/openjdk7.rb
@@ -0,0 +1,17 @@
+version = 7
+
+pkgs = value_for_platform(
+  ["centos","redhat","fedora","scientific","amazon"] => {
+    "default" => ["java-1.#{version}.0-openjdk","java-1.#{version}.0-openjdk-devel"]
+  },
+  ["arch","freebsd"] => {
+    "default" => ["openjdk#{version}"]
+  },
+  "default" => ["openjdk-#{version}-jdk"]
+)
+
+pkgs.each do |pkg|
+  package pkg do
+    action :install
+  end
+end