3 files changed, 4 insertions, 10 deletions
diff --git a/puppet/modules/ci_tester/manifests/linux.pp b/puppet/modules/ci_tester/manifests/linux.pp
index bb052b6..75fb9f9 100644
--- a/puppet/modules/ci_tester/manifests/linux.pp
+++ b/puppet/modules/ci_tester/manifests/linux.pp
@@ -7,11 +7,6 @@ class ci_tester::linux inherits ci_tester::base {
         include vmware_tools
     }
 
-    package {
-        # for android:
-        "openjdk-6-jdk": ensure => installed;
-    }
-
     # Allow test machines to install modules from cpan under $HOME/perl5
     include homedir_cpan
 
diff --git a/puppet/modules/packaging_tester/manifests/linux.pp b/puppet/modules/packaging_tester/manifests/linux.pp
index d70202e..61803a5 100644
--- a/puppet/modules/packaging_tester/manifests/linux.pp
+++ b/puppet/modules/packaging_tester/manifests/linux.pp
@@ -8,11 +8,6 @@ class packaging_tester::linux inherits packaging_tester::base {
     }
 
     package {
-        # for android:
-        "openjdk-6-jdk": ensure => installed;
-    }
-
-    package {
         # for configure test cases
         "expect":             ensure => installed;
     }
diff --git a/puppet/modules/qt_prereqs/manifests/ubuntu.pp b/puppet/modules/qt_prereqs/manifests/ubuntu.pp
index 3a0aa84..7dbff99 100644
--- a/puppet/modules/qt_prereqs/manifests/ubuntu.pp
+++ b/puppet/modules/qt_prereqs/manifests/ubuntu.pp
@@ -144,6 +144,10 @@ class qt_prereqs::ubuntu inherits qt_prereqs::unix {
         }
     }
 
+    package {
+        # for android:
+        "openjdk-6-jdk": ensure => installed;
+    }
 }