Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Some more pungi fixes

Browse source 
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2017-10-23 15:19:43 +00:00
parent e0d65a567b
commit ae2e07e95f
1 changed files with 3 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

25
roles/bodhi2/backend/files/pungi.rpm.conf.j2
View file

@ -14,7 +14,7 @@ comps_file = {
'file': 'comps-{{ release.branch }}.xml', 'file': 'comps-{{ release.branch }}.xml',
'command': 'make', 'command': 'make',
} }
variants_file='variants-fedora.xml' variants_file='variants.xml'
sigkeys = [ sigkeys = [
{% release.version_int == 25 %} {% release.version_int == 25 %}
'fdb19c98' 'fdb19c98'
@ -32,7 +32,6 @@ hashed_directories = True
# RUNROOT settings # RUNROOT settings
runroot = True runroot = True
#runroot_channel = 'fedora_compose'
runroot_channel = 'compose' runroot_channel = 'compose'
runroot_tag = '{{ release.dist_tag }}-build' runroot_tag = '{{ release.dist_tag }}-build'
@ -60,26 +59,8 @@ media_checksum_one_file = True
media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s.%(respin)s-%(arch)s' media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s.%(respin)s-%(arch)s'
#jigdo #jigdo
create_jigdo = False create_jigdo = False
#extra_packages = [
# '/mnt/packages/foo*',
#]
# fomat: [(variant_uid_regex, {arch|*: [packages]})]
additional_packages = [ additional_packages = [
('.*', {
'*': [
'kernel.*',
'dracut.*',
'autocorr-.*',
'eclipse-nls-.*',
'hunspell-.*',
'hyphen-.*',
'calligra-l10n-.*',
'kde-l10n-.*',
'libreoffice-langpack-.*',
'man-pages-.*',
'mythes-.*',
],
}),
('^Everything$', { ('^Everything$', {
'*': [ '*': [
'*', '*',
@ -119,7 +100,7 @@ createiso_skip = [
}), }),
] ]
{% if release.collection_name == 'Fedora' %} {% if release.id_prefix == 'FEDORA' %}
ostree = [ ostree = [
("^Atomic$", { ("^Atomic$", {
"x86_64": { "x86_64": {