From 2c8ce7072d2c54672e5a3f145d84f3d6a625d9a4 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 24 Oct 2017 16:39:17 +0200 Subject: [PATCH] Turn all pungi configs into a single one Signed-off-by: Patrick Uiterwijk --- ...gi.module.conf.j2 => pungi.module.conf.j2} | 19 +++++---- ...ng-pungi.rpm.conf.j2 => pungi.rpm.conf.j2} | 40 +++++++++---------- ...s.module.xml.j2 => variants.module.xml.j2} | 6 +-- ...ariants.rpm.xml.j2 => variants.rpm.xml.j2} | 0 roles/bodhi2/backend/tasks/main.yml | 2 +- 5 files changed, 36 insertions(+), 31 deletions(-) rename roles/bodhi2/backend/files/{staging-pungi.module.conf.j2 => pungi.module.conf.j2} (71%) rename roles/bodhi2/backend/files/{staging-pungi.rpm.conf.j2 => pungi.rpm.conf.j2} (75%) rename roles/bodhi2/backend/files/{staging-variants.module.xml.j2 => variants.module.xml.j2} (78%) rename roles/bodhi2/backend/files/{staging-variants.rpm.xml.j2 => variants.rpm.xml.j2} (100%) diff --git a/roles/bodhi2/backend/files/staging-pungi.module.conf.j2 b/roles/bodhi2/backend/files/pungi.module.conf.j2 similarity index 71% rename from roles/bodhi2/backend/files/staging-pungi.module.conf.j2 rename to roles/bodhi2/backend/files/pungi.module.conf.j2 index c6951c3138..5c4ee8ea5b 100644 --- a/roles/bodhi2/backend/files/staging-pungi.module.conf.j2 +++ b/roles/bodhi2/backend/files/pungi.module.conf.j2 @@ -1,15 +1,20 @@ # PRODUCT INFO -release_name = '{{ release.id_prefix.title() }}' -release_short = '{{ release.id_prefix.title() }}' -release_version = '{{ release.version_int }}' -release_type = 'updates{% if request.name == 'testing' %}-testing{% endif %}' +release_name = '[[ release.id_prefix.title() ]]' +release_short = '[[ release.id_prefix.title() ]]' +release_version = '[[ release.version_int ]]' +release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]' release_is_layered = False # GENERAL SETTINGS bootable = False variants_file='module-variants.xml' -sigkeys = ['a3cc4e62', None] +sigkeys = [ + 'a3cc4e62', +{% if env == "staging" %} + None +{% endif %} +] hashed_directories = True @@ -17,7 +22,7 @@ hashed_directories = True runroot = False # PDC settings -pdc_url = 'https://pdc.stg.fedoraproject.org/rest_api/v1' +pdc_url = 'https://pdc{{ env_suffix }}.fedoraproject.org/rest_api/v1' pdc_insecure = False pdc_develop = True @@ -52,7 +57,7 @@ skip_phases= ["live_media", "ostree"] translate_paths = [ - ('/mnt/koji/compose/', 'http://kojipkgs.stg.fedoraproject.org/compose/'), + ('/mnt/koji/compose/', 'http://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/'), ] createiso_skip = [ diff --git a/roles/bodhi2/backend/files/staging-pungi.rpm.conf.j2 b/roles/bodhi2/backend/files/pungi.rpm.conf.j2 similarity index 75% rename from roles/bodhi2/backend/files/staging-pungi.rpm.conf.j2 rename to roles/bodhi2/backend/files/pungi.rpm.conf.j2 index 9b80cb4fda..56b2e4dd72 100644 --- a/roles/bodhi2/backend/files/staging-pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/files/pungi.rpm.conf.j2 @@ -1,9 +1,9 @@ # PRODUCT INFO skip_phases= ["buildinstall"] -release_name = '{{ release.id_prefix.title() }}' -release_short = '{{ release.id_prefix.title() }}' -release_version = '{{ release.version_int }}' -release_type = 'updates{% if request.name == 'testing' %}-testing{% endif %}' +release_name = '[[ release.id_prefix.title() ]]' +release_short = '[[ release.id_prefix.title() ]]' +release_version = '[[ release.version_int ]]' +release_type = 'updates[% if request.name == 'testing' %]-testing[% endif %]' release_is_layered = False # GENERAL SETTINGS @@ -11,22 +11,22 @@ comps_file = { 'scm': 'git', 'repo': 'https://pagure.io/fedora-comps.git', 'branch': None, # defaults to cvs/HEAD or git/master - 'file': 'comps-{{ release.branch }}.xml', + 'file': 'comps-[[ release.branch ]].xml', 'command': 'make', } variants_file='variants.xml' sigkeys = [ -{% if release.version_int == 25 %} +[% if release.version_int == 25 %] 'fdb19c98', -{% elif release.version_int == 26 %} +[% elif release.version_int == 26 %] '64dab85d', -{% elif release.version_int == 27 %} +[% elif release.version_int == 27 %] 'f5282ee4', -{% elif release.version_int == 6 %} +[% elif release.version_int == 6 %] '0608b895', -{% elif release.version_int == 7 %} +[% elif release.version_int == 7 %] '352C64E5', -{% endif %} +[% endif %] None ] hashed_directories = True @@ -34,11 +34,11 @@ hashed_directories = True # RUNROOT settings runroot = True runroot_channel = 'compose' -runroot_tag = '{{ release.dist_tag }}-build' +runroot_tag = '[[ release.dist_tag ]]-build' # PKGSET pkgset_source = 'koji' # koji, repos -pkgset_koji_tag = '{{ id }}' +pkgset_koji_tag = '[[ id ]]' pkgset_koji_inherit = False filter_system_release_packages = False @@ -101,27 +101,27 @@ createiso_skip = [ }), ] -{% if release.id_prefix == 'FEDORA' %} +[% if release.id_prefix == 'FEDORA' %] ostree = [ ("^Everything$", { "x86_64": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "treefile": "fedora-atomic-host.json", "config_url": "https://pagure.io/fedora-atomic.git", - "config_branch": "f{{ release.version }}", + "config_branch": "f[[ release.version ]]", "repo": [ "Everything", - {% if request.name == 'testing' %} + [% if request.name == 'testing' %] # In the case of testing, also inject the last stable updates - "https://kojipkgs.stg.fedoraproject.org/compose/updates/f{{ release.version }}-updates/compose/Everything/x86_64/os/" - {% endif %} - "https://dl.fedoraproject.org/pub/fedora/linux/releases/{{ release.version_int }}/Everything/x86_64/os/" + "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version ]]-updates/compose/Everything/x86_64/os/" + [% endif %] + "https://dl.fedoraproject.org/pub/fedora/linux/releases/[[ release.version_int ]]/Everything/x86_64/os/" ] "ostree_repo": "/mnt/koji/compose/atomic/rawhide/", } }) ] -{% endif %} +[% endif %] translate_paths = [ ('/mnt/koji/compose/', 'https://kojipkgs.stg.fedoraproject.org/compose/'), diff --git a/roles/bodhi2/backend/files/staging-variants.module.xml.j2 b/roles/bodhi2/backend/files/variants.module.xml.j2 similarity index 78% rename from roles/bodhi2/backend/files/staging-variants.module.xml.j2 rename to roles/bodhi2/backend/files/variants.module.xml.j2 index 8f7184847f..c97b0b055b 100644 --- a/roles/bodhi2/backend/files/staging-variants.module.xml.j2 +++ b/roles/bodhi2/backend/files/variants.module.xml.j2 @@ -6,9 +6,9 @@ x86_64 - {% for module in modules %} - {{ module }} - {% endfor %} + [% for module in modules %] + [[ module ]] + [% endfor %] diff --git a/roles/bodhi2/backend/files/staging-variants.rpm.xml.j2 b/roles/bodhi2/backend/files/variants.rpm.xml.j2 similarity index 100% rename from roles/bodhi2/backend/files/staging-variants.rpm.xml.j2 rename to roles/bodhi2/backend/files/variants.rpm.xml.j2 diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 458be70a8f..a8acf50ee8 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -110,7 +110,7 @@ - config - name: Put pungi configurations in place - copy: src="{{env}}-{{item}}" dest=/etc/bodhi/{{item}} + template: src="{{item}}" dest=/etc/bodhi/{{item}} with_items: - pungi.module.conf.j2 - pungi.rpm.conf.j2