Drop xvfb from jenkins master and workers

theforeman · Apr 1, 2019 · 3b43a6c · 3b43a6c
1 parent 23604b9
commit 3b43a6c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/puppet/modules/jenkins_master/manifests/init.pp b/puppet/modules/jenkins_master/manifests/init.pp
@@ -189,7 +189,6 @@
     'workflow-step-api'                  => {},
     'workflow-support'                   => {},
     'xunit'                              => {},
-    'xvfb'                               => {},
     'zentimestamp'                       => {},
   }
 

diff --git a/puppet/modules/slave/manifests/init.pp b/puppet/modules/slave/manifests/init.pp
@@ -117,12 +117,6 @@
         'Debian' => 'iceweasel',
         default  => 'firefox'
       };
-    'xvfb':
-      ensure => present,
-      name   => $::osfamily ? {
-        'Debian' => 'xvfb',
-        default  => 'xorg-x11-server-Xvfb'
-      };
     'augeas-dev':
       ensure => present,
       name   => $::osfamily ? {
@@ -305,11 +299,7 @@
 
   # Cleanup Jenkins Xvfb processes from aborted builds after a day
   file { '/etc/cron.daily/xvfb_cleaner':
-    ensure  => file,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0755',
-    content => "#!/bin/sh\nps -eo pid,etime,comm | awk '(\$2 ~ /-/ && \$3 ~ /Xvfb/) { print \$1 }' | xargs kill >/dev/null 2>&1 || true\n",
+    ensure  => absent,
   }
 
   # Cleanup Jenkins Ruby processes from aborted builds after a day