Merge from default production
authorMark Cornmesser <mcornmesser@mozilla.com>
Tue, 02 Aug 2016 09:44:24 -0700
branchproduction
changeset 4196 f9c75376fdf6442c38798f1b50e27fc0460d52dd
parent 4194 374bf30a20e5c539c296ebb8f2e8dfb44d1801e0 (current diff)
parent 4195 893464b38d08ae7526c2cdf89dd0d7d065af13d2 (diff)
child 4197 f44bad09621ddb6d085044b5615e597acf7c5edb
push id3186
push usermcornmesser@mozilla.com
push dateTue, 02 Aug 2016 16:44:35 +0000
Merge from default
modules/packages/manifests/java.pp
deleted file mode 100644
--- a/modules/packages/manifests/java.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-class packages::java {
-    anchor {
-        'packages::java::begin': ;
-        'packages::java::end': ;
-    }
-
-    case $::operatingsystem {
-        Darwin: {
-            # The dmg is available from https://www.java.com/en/download/manual.jsp
-            Anchor['packages::java::begin'] ->
-            packages::pkgdmg {
-                "java":
-                    version => "7.0.600",
-                    os_version_specific => false,
-            } -> Anchor['packages::java::end']
-        }
-        Ubuntu: {
-            package {
-                "openjdk-7-jre":
-                    ensure => latest;
-
-                # Install icedtea-netx for the javaws command
-                "icedtea-netx":
-                    ensure => latest,
-                    require => Package["openjdk-7-jre"];
-            }
-        }
-        default: {
-            fail("Cannot install on $::operatingsystem")
-        }
-    }
-}
--- a/modules/toplevel/manifests/slave/qa.pp
+++ b/modules/toplevel/manifests/slave/qa.pp
@@ -1,18 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # All QA slaves (both mozmill-ci and tps-ci) are subclasses of this class.
 class toplevel::slave::qa inherits toplevel::slave {
     include vnc
 
-    include packages::java
-
     class {
         gui:
             on_gpu => true,
             screen_width => 1024,
             screen_height => 768,
             screen_depth => 32,
             refresh => 60;
     }