Skip to content

Commit

Permalink
Revert "Remove tito from our RPM builders"
Browse files Browse the repository at this point in the history
This reverts commit 61cca97.
  • Loading branch information
ehelms committed Jul 13, 2023
1 parent c87e65b commit 1026cef
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
18 changes: 15 additions & 3 deletions puppet/modules/slave/manifests/packaging/rpm.pp
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,25 @@
}

unless $is_el8 {
# Tito was used in the past, but no longer. This cleans up the files we used to have.
# tito
# Work around to fix https://github.com/rpm-software-management/tito/pull/354#issuecomment-613523823
# Pulled from the infra repository
package { 'tito':
ensure => absent,
ensure => '0.6.12',
}

file { "${homedir}/.titorc":
ensure => absent,
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',
}
}

Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/unattended/manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
class { 'yum_cron':
apply_updates => true,
mailto => 'sysadmins',
exclude_packages => ['kernel*', 'java*', 'jenkins'],
exclude_packages => ['kernel*', 'java*', 'jenkins', 'tito'],
}
}
}

0 comments on commit 1026cef

Please sign in to comment.