summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Uiterwijk <puiterwijk@redhat.com>2018-04-12 15:32:32 -0400
committerPatrick Uiterwijk <puiterwijk@redhat.com>2018-04-12 15:32:32 -0400
commit2c3b643da2af0313707df0857a49a1c91969a3ad (patch)
treef4e18a1acaa32a153f0e45303ab8eb43efe621ae
parentaa9a5001f26592d6e3514c7a358df601231da5ed (diff)
downloadansible-2c3b643da2af0313707df0857a49a1c91969a3ad.zip
ansible-2c3b643da2af0313707df0857a49a1c91969a3ad.tar.gz
ansible-2c3b643da2af0313707df0857a49a1c91969a3ad.tar.xz
Let's give this delayed pungi run a try
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
-rw-r--r--roles/bodhi2/backend/templates/pungi.rpm.conf.j265
1 files changed, 64 insertions, 1 deletions
diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 0672020..2f57e62 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -1,5 +1,5 @@
# PRODUCT INFO
-skip_phases= ["buildinstall"]
+skip_phases = ["buildinstall", "productimg", "extra_files"]
release_name = '[[ release.id_prefix.title() ]]'
release_short = '[[ release.id_prefix.title() ]]'
release_version = '[[ release.version_int ]]'
@@ -35,6 +35,10 @@ sigkeys = [
{% endif %}
]
hashed_directories = True
+tree_arches = ['aarch64', 'ppc64le', 'x86_64']
+runroot = True
+runroot_channel = 'compose'
+runroot_tag = 'f[[ release.version_int ]]-build'
# RUNROOT settings
runroot = True
@@ -179,6 +183,65 @@ ostree = {
]
}
[% endif %]
+
+[% if release.id_prefix == 'FEDORA' and release.version_int >= 28 %]
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f27'
+global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
+
+# Other ostree artifacts
+image_build = {
+ '^Everything$': [
+ {
+ 'image-build': {
+ 'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')],
+ 'name': 'Fedora-Atomic',
+ 'kickstart': 'fedora-kickstart.ks',
+ 'distro': 'Fedora-22',
+ 'disk_size': 6,
+ 'arches': ['x86_64', 'aarch64', 'ppc64le'],
+ 'install_tree_from': "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
+ 'subvariant': 'AtomicHost',
+ }
+ }
+ ]
+}
+
+ostree_installer = {
+ ('^Everything%', {
+ [% for arch in ['x86_64', 'aarch64', 'ppc64le'] %]
+ '[[ arch ]]': {
+ "repo": [
+ "Everything",
+ [% if request.name == 'testing' %]
+ # In the case of testing, also inject the last stable updates
+ "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/",
+ [% endif %]
+ # For f28 the compose location is under /compose/branched/
+ [% if release.version_int == 28 %]
+ "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
+ [% else %]
+ "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
+ [% endif %]
+ ],
+ 'release': None,
+ 'rootfs_size': '4',
+ 'add_template': ['ostree-based-installer/lorax-configure-repo.tmpl',
+ 'ostree-based-installer/lorax-embed-repo.tmpl'],
+ 'add_template_var': [
+ 'ostree_install_repo=https://kojipkgs.fedoraproject.org/atomic/repo/',
+ 'ostree_update_repo=https://dl.fedoraproject.org/atomic/repo/',
+ 'ostree_osname=fedora-atomic',
+ 'ostree_install_ref=fedora/[[ release.version_int ]]/[[ arch ]]/[% if request.name == "testing" %]testing[% else %]updates[% endif %]/atomic-host',
+ 'ostree_update_ref=fedora/[[ release.version_int ]]/[[ arch ]]/atomic-host',
+
+ ],
+ 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
+ 'template_branch': 'f[[ release.version_int ]]'
+ },
+ [% endfor %]
+ })
+}
+[% endif %]
{% endif %}
translate_paths = [