Bug 1273286 - Upgrade Linux drivers to NVIDIA 361.42 r=Callek
MozReview-Commit-ID: Klu1J2MVuOO
--- a/manifests/moco-nodes.pp
+++ b/manifests/moco-nodes.pp
@@ -1,32 +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/.
## testers
# linux64 and OS X
-node "talos-linux64-ix-024.test.releng.scl3.mozilla.com" {
- $pin_puppet_server = "releng-puppet2.srv.releng.scl3.mozilla.com"
- $pin_puppet_env = "raliiev"
- $aspects = [ 'low-security' ]
- $slave_trustlevel = 'try'
- include toplevel::slave::releng::test::gpu
-}
-
-node /talos-linux64-ix-0[01].\.test\.releng\.scl3\.mozilla.com/ {
- $pin_puppet_server = "releng-puppet2.srv.releng.scl3.mozilla.com"
- $pin_puppet_env = "raliiev"
- $aspects = [ 'low-security' ]
- $slave_trustlevel = 'try'
- include toplevel::slave::releng::test::gpu
-}
-
node /t.*-\d+\.test\.releng\.scl3\.mozilla\.com/ {
# hosts starting with t and ending in -digit.test.releng.scl3.mozilla.com
$aspects = [ 'low-security' ]
$slave_trustlevel = 'try'
include toplevel::slave::releng::test::gpu
}
# AWS
--- a/modules/gui/manifests/init.pp
+++ b/modules/gui/manifests/init.pp
@@ -8,17 +8,17 @@ class gui(
$screen_height,
$screen_depth,
$refresh
) {
include config
include users::builder
include gui::appearance
- $nvidia_version = '310.32'
+ $nvidia_version = '361.42'
$gpu_bus_id = "PCI:01:00:0"
# only use the nvidia drivers and settings if we're using a GPU, and are not
# in virtualization mode
$use_nvidia = $on_gpu and $::virtual == "physical"
case $::operatingsystem {
Darwin: {
--- a/modules/packages/manifests/nvidia_drivers.pp
+++ b/modules/packages/manifests/nvidia_drivers.pp
@@ -1,36 +1,34 @@
# 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::nvidia_drivers {
include needs_reboot
- if ($::operatingsystem != Windows) {
- realize(Packages::Aptrepo['xorg-edgers'])
- }
-
- # The Ubuntu xorg-edgers reqo embeds the version number in the package
- # name, so we can easily require "latest"
-
- $nvidia_version = "310"
- $nvidia_full_version = "310.32"
-
case $::operatingsystem {
Ubuntu: {
+ $nvidia_version = "361"
+ $nvidia_full_version = "361.42"
+ # The Ubuntu graphics-drivers repo embeds the version number in the
+ # package name, so we can easily require "latest"
+ realize(Packages::Aptrepo['graphics-drivers'])
package {
"nvidia-$nvidia_version":
ensure => latest,
require => Class['packages::kernel'],
# the nvidia drivers need to be loaded, which usually
# requires unloading the nouveau drivers, which are
# installed by default for the startup frame buffer.. so we
# need to reboot.
- notify => Exec['reboot_semaphore']
+ notify => Exec['reboot_semaphore'];
+ ['nvidia-310', 'nvidia-settings-310']:
+ ensure => absent,
+ notify => Exec['reboot_semaphore'];
}
file {
"/etc/init/nvidia-$nvidia_version.conf":
notify => Exec['reboot_semaphore'],
require => Package["nvidia-$nvidia_version"],
mode => 0755,
content => template("${module_name}/nvidia_dkms.conf.erb");
}
--- a/modules/packages/manifests/setup.pp
+++ b/modules/packages/manifests/setup.pp
@@ -191,18 +191,18 @@ class packages::setup {
distribution => "${lsbdistcodename}-updates",
components => ["all"];
"puppetlabs":
url_path => "repos/apt/puppetlabs",
distribution => "${lsbdistcodename}",
components => ["dependencies", "main"];
}
@packages::aptrepo {
- "xorg-edgers":
- url_path => "repos/apt/xorg-edgers",
+ "graphics-drivers":
+ url_path => "repos/apt/graphics-drivers",
distribution => "${lsbdistcodename}",
components => ["main"];
"nginx-development":
url_path => "repos/apt/nginx-development",
distribution => "${lsbdistcodename}",
components => ["main"];
"mig-agent":
url_path => "repos/apt/custom/mig-agent",