From 61cca97c19bf28c93bc952e3f573f66040c459a7 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 12 Jul 2023 13:34:41 +0200 Subject: [PATCH] Remove tito from our RPM builders We've stopped using this and can be cleaned up. --- .../modules/slave/manifests/packaging/rpm.pp | 18 +++--------------- puppet/modules/unattended/manifests/init.pp | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/puppet/modules/slave/manifests/packaging/rpm.pp b/puppet/modules/slave/manifests/packaging/rpm.pp index fa410677b..ac3878e65 100644 --- a/puppet/modules/slave/manifests/packaging/rpm.pp +++ b/puppet/modules/slave/manifests/packaging/rpm.pp @@ -69,25 +69,13 @@ } unless $is_el8 { - # tito - # Work around to fix https://github.com/rpm-software-management/tito/pull/354#issuecomment-613523823 - # Pulled from the infra repository + # Tito was used in the past, but no longer. This cleans up the files we used to have. package { 'tito': - ensure => '0.6.12', + ensure => absent, } file { "${homedir}/.titorc": - ensure => file, - mode => '0644', - owner => 'jenkins', - group => 'jenkins', - content => "KOJI_OPTIONS=-c ~/.koji/config build --nowait\n", - } - - file { '/tmp/tito': - ensure => directory, - owner => 'jenkins', - group => 'jenkins', + ensure => absent, } } diff --git a/puppet/modules/unattended/manifests/init.pp b/puppet/modules/unattended/manifests/init.pp index 922d30e4a..6c206b1b1 100644 --- a/puppet/modules/unattended/manifests/init.pp +++ b/puppet/modules/unattended/manifests/init.pp @@ -21,7 +21,7 @@ class { 'yum_cron': apply_updates => true, mailto => 'sysadmins', - exclude_packages => ['kernel*', 'java*', 'jenkins', 'tito'], + exclude_packages => ['kernel*', 'java*', 'jenkins'], } } }