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

Bodhi compose config: build ostrees and containers in variants

Browse source 
Our compose attempt with the containers being built under
Everything didn't go as planned because the filenames of the
container images turn out to be determined by the variant, so
they conflicted and only the last one built survived. So, we
really need to build them under unique variants for now. A
previous commit added the variant definitions.

We don't *need* to build the ostrees under the variants, but it
feels more consistent this way, both with the containers and
with how it works in the Rawhide/Branched composes.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-05-01 09:49:20 -07:00 • committed by kevin
parent 4aed740463
commit 5f2d78a83c
1 changed files with 98 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

208
roles/bodhi2/backend/templates/pungi.rpm.conf.j2
View file

@ -137,121 +137,109 @@ createiso_skip = [
{% if env != "staging" %}
[% if release.id_prefix == 'FEDORA' %]
ostree = {
"^Everything$": [
# Fedora Silverblue
{
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% if release.version_int >= 39 %]
"unified_core": True,
"runroot_packages": ["selinux-policy-targeted"],
[% endif %]
"treefile": "fedora-silverblue.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"ostree_repo": "/mnt/koji/compose/ostree/repo",
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/[[ ostreeref ]]/silverblue",
"tag_ref": False,
"arches": ["x86_64", "ppc64le", "aarch64" ],
"failable": ["x86_64", "ppc64le", "aarch64" ]
},
# Fedora Kinoite
{
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% if release.version_int >= 39 %]
"unified_core": True,
"runroot_packages": ["selinux-policy-targeted"],
[% endif %]
"treefile": "fedora-kinoite.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"ostree_repo": "/mnt/koji/compose/ostree/repo",
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/[[ ostreeref ]]/kinoite",
"tag_ref": False,
"arches": ["x86_64", "ppc64le", "aarch64" ],
"failable": ["x86_64", "ppc64le", "aarch64" ]
},
# Fedora Sway Atomic (formerly Sericea)
{
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% if release.version_int >= 39 %]
"unified_core": True,
"runroot_packages": ["selinux-policy-targeted"],
[% endif %]
"treefile": "fedora-sericea.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"ostree_repo": "/mnt/koji/compose/ostree/repo",
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/[[ ostreeref ]]/sericea",
"tag_ref": False,
"arches": ["x86_64", "aarch64"],
"failable": ["x86_64", "aarch64"]
},
# Fedora Budgie Atomic (formerly Onyx)
"^Silverblue$": {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% if release.version_int >= 39 %]
{
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
"unified_core": True,
"runroot_packages": ["selinux-policy-targeted"],
"treefile": "fedora-onyx.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"ostree_repo": "/mnt/koji/compose/ostree/repo",
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/[[ ostreeref ]]/onyx",
"tag_ref": False,
"arches": ["x86_64"],
"failable": ["x86_64"]
},
"unified_core": True,
"runroot_packages": ["selinux-policy-targeted"],
[% endif %]
]
"treefile": "fedora-silverblue.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"ostree_repo": "/mnt/koji/compose/ostree/repo",
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/[[ ostreeref ]]/silverblue",
"tag_ref": False,
"arches": ["x86_64", "ppc64le", "aarch64" ],
"failable": ["x86_64", "ppc64le", "aarch64" ]
},
"^Kinoite$": {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% if release.version_int >= 39 %]
"unified_core": True,
"runroot_packages": ["selinux-policy-targeted"],
[% endif %]
"treefile": "fedora-kinoite.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"ostree_repo": "/mnt/koji/compose/ostree/repo",
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/[[ ostreeref ]]/kinoite",
"tag_ref": False,
"arches": ["x86_64", "ppc64le", "aarch64" ],
"failable": ["x86_64", "ppc64le", "aarch64" ]
},
"^Sericea$": {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
[% if release.version_int >= 39 %]
"unified_core": True,
"runroot_packages": ["selinux-policy-targeted"],
[% endif %]
"treefile": "fedora-sericea.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"ostree_repo": "/mnt/koji/compose/ostree/repo",
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/[[ ostreeref ]]/sericea",
"tag_ref": False,
"arches": ["x86_64", "aarch64"],
"failable": ["x86_64", "aarch64"]
},
[% if release.version_int >= 39 %]
"^Onyx$": {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
"unified_core": True,
"runroot_packages": ["selinux-policy-targeted"],
"treefile": "fedora-onyx.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"ostree_repo": "/mnt/koji/compose/ostree/repo",
"ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/[[ ostreeref ]]/onyx",
"tag_ref": False,
"arches": ["x86_64"],
"failable": ["x86_64"]
},
[% endif %]
}
[% if release.version_int >= 40 %]
ostree_container = {
"^Everything$": [
# Fedora Silverblue
{
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"treefile": "fedora-silverblue.yaml",
"arches": ["x86_64", "ppc64le", "aarch64"],
"failable": ['*'],
},
# Fedora Kinoite
{
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"treefile": "fedora-kinoite.yaml",
"arches": ["x86_64", "ppc64le", "aarch64"],
"failable": ['*'],
},
# Fedora Sway Atomic (formerly Sericea)
{
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"treefile": "fedora-sericea.yaml",
"arches": ["x86_64", "aarch64"],
"failable": ['*'],
},
{
# Fedora Budgie Atomic (formerly Onyx)
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"treefile": "fedora-onyx.yaml",
"arches": ["x86_64"],
"failable": ['*'],
},
],
"^Silverblue$": {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"treefile": "fedora-silverblue.yaml",
"arches": ["x86_64", "ppc64le", "aarch64"],
"failable": ['*'],
},
"^Kinoite$": {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"treefile": "fedora-kinoite.yaml",
"arches": ["x86_64", "ppc64le", "aarch64"],
"failable": ['*'],
},
"^Sericea$": {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"treefile": "fedora-sericea.yaml",
"arches": ["x86_64", "aarch64"],
"failable": ['*'],
},
"^Onyx$": {
"version": "!VERSION_FROM_VERSION_DATE_RESPIN",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "f[[ release.version ]]",
"repo": {{ repos }},
"treefile": "fedora-onyx.yaml",
"arches": ["x86_64"],
"failable": ['*'],
},
}
[% endif %]
[% endif %]