Revert "Disable ostree repo creation and image artifacts"

Enable the ostree repo creation and image generation since
https://bodhi.fedoraproject.org/updates/FEDORA-2019-00404bae09
is now stable

This reverts commit 98e00004c5.
This commit is contained in:
Mohan Boddu 2019-03-04 14:40:09 +00:00
parent 723b21b2f0
commit fd585f6f3f

View file

@ -119,76 +119,76 @@ createiso_skip = [
{% if env != "staging" %} {% if env != "staging" %}
[% if release.id_prefix == 'FEDORA' %] [% if release.id_prefix == 'FEDORA' %]
#ostree = { ostree = {
# "^Everything$": [ "^Everything$": [
# # Atomic Host # Atomic Host
# # Atomic Host will be avilable till F29 EOL # Atomic Host will be avilable till F29 EOL
# # See https://github.com/coreos/fedora-coreos-tracker/issues/145 # See https://github.com/coreos/fedora-coreos-tracker/issues/145
# [% if release.version_int <= 29 %] [% if release.version_int <= 29 %]
# { {
# "version": "!VERSION_FROM_VERSION_DATE_RESPIN", "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
# "force_new_commit": True "force_new_commit": True
# "treefile": "fedora-atomic-host.json", "treefile": "fedora-atomic-host.json",
# "config_url": "https://pagure.io/fedora-atomic.git", "config_url": "https://pagure.io/fedora-atomic.git",
# "config_branch": "f[[ release.version ]]", "config_branch": "f[[ release.version ]]",
# "repo": [ "repo": [
# "Everything", "Everything",
# "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/", "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/",
# [% if request.name == 'testing' %] [% if request.name == 'testing' %]
# # In the case of testing, also inject the last stable updates # 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/" "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/"
# [% endif %] [% endif %]
# ] ]
# "ostree_repo": "/mnt/koji/compose/ostree/repo", "ostree_repo": "/mnt/koji/compose/ostree/repo",
# [% if request.name == 'stable' %] [% if request.name == 'stable' %]
# "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/atomic-host", "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/atomic-host",
# [% else %] [% else %]
# "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/atomic-host", "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/atomic-host",
# [% endif %] [% endif %]
# "tag_ref": False, "tag_ref": False,
# "arches": ["x86_64", "ppc64le", "aarch64" ], "arches": ["x86_64", "ppc64le", "aarch64" ],
# "failable": ["ppc64le", "aarch64"], "failable": ["ppc64le", "aarch64"],
# }, },
# [% endif %] [% endif %]
# # Fedora Silverblue # Fedora Silverblue
# { {
# "version": "!VERSION_FROM_VERSION_DATE_RESPIN", "version": "!VERSION_FROM_VERSION_DATE_RESPIN",
# [% if release.version_int >= 29 %] [% if release.version_int >= 29 %]
# "treefile": "fedora-silverblue.yaml", "treefile": "fedora-silverblue.yaml",
# [% else %] [% else %]
# "treefile": "fedora-atomic-workstation-updates-[[ request.name ]].json", "treefile": "fedora-atomic-workstation-updates-[[ request.name ]].json",
# [% endif %] [% endif %]
# "config_url": "https://pagure.io/workstation-ostree-config.git", "config_url": "https://pagure.io/workstation-ostree-config.git",
# "config_branch": "f[[ release.version ]]", "config_branch": "f[[ release.version ]]",
# "repo": [ "repo": [
# "Everything", "Everything",
# [% if request.name == 'testing' %] [% if request.name == 'testing' %]
# # In the case of testing, also inject the last stable updates # 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/", "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/",
# [% endif %] [% endif %]
# # For f30 the compose location is going to be under /compose/branched/ # For f30 the compose location is going to be under /compose/branched/
# [% if release.version_int == 30 %] [% if release.version_int == 30 %]
# "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/branched/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
# [% else %] [% else %]
# "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/" "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$basearch/os/"
# [% endif %] [% endif %]
# ] ]
# "ostree_repo": "/mnt/koji/compose/ostree/repo", "ostree_repo": "/mnt/koji/compose/ostree/repo",
# # For f29+ we are changing the ref to silverblue. For f28/f27 let the files # For f29+ we are changing the ref to silverblue. For f28/f27 let the files
# # still specify the workstation ref. # still specify the workstation ref.
# [% if release.version_int >= 29 %] [% if release.version_int >= 29 %]
# [% if request.name == 'stable' %] [% if request.name == 'stable' %]
# "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/silverblue", "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/updates/silverblue",
# [% else %] [% else %]
# "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/silverblue", "ostree_ref": "fedora/[[ release.version_int ]]/${basearch}/testing/silverblue",
# [% endif %] [% endif %]
# [% endif %] [% endif %]
# "tag_ref": False, "tag_ref": False,
# "arches": ["x86_64"], "arches": ["x86_64"],
# "failable": ["x86_64"] "failable": ["x86_64"]
# }, },
# ] ]
#} }
[% endif %] [% endif %]
[% if release.id_prefix == 'FEDORA' and release.version_int == 29 %] [% if release.id_prefix == 'FEDORA' and release.version_int == 29 %]
@ -204,100 +204,100 @@ volume_id_substitutions = {
} }
# Other ostree artifacts # Other ostree artifacts
#image_build = { image_build = {
# '^AtomicHost$': [ '^AtomicHost$': [
# { {
# 'image-build': { 'image-build': {
# 'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')], 'format': [('qcow2', 'qcow2'), ('raw-xz', 'raw.xz')],
# 'name': 'Fedora-AtomicHost', 'name': 'Fedora-AtomicHost',
# [% if request.name == 'stable' %] [% if request.name == 'stable' %]
# # Use a different version string for the updates vs updates-testing # Use a different version string for the updates vs updates-testing
# # runs so that NVRs don't conflict # runs so that NVRs don't conflict
# 'version': '!VERSION_FROM_VERSION' 'version': '!VERSION_FROM_VERSION'
# [% endif %] [% endif %]
# 'release': '!RELEASE_FROM_DATE_RESPIN' 'release': '!RELEASE_FROM_DATE_RESPIN'
# [% if request.name == 'stable' %] [% if request.name == 'stable' %]
# # Use updates ref to build updates images and testing ref to build # Use updates ref to build updates images and testing ref to build
# # updates-testing images. # updates-testing images.
# # https://pagure.io/fedora-kickstarts/c/899bc45aa1d432ca67372ed112de16c0ea89251c?branch=f29 # https://pagure.io/fedora-kickstarts/c/899bc45aa1d432ca67372ed112de16c0ea89251c?branch=f29
# 'kickstart': 'fedora-atomic-updates.ks', 'kickstart': 'fedora-atomic-updates.ks',
# [% else %] [% else %]
# 'kickstart': 'fedora-atomic-testing.ks', 'kickstart': 'fedora-atomic-testing.ks',
# [% endif %] [% endif %]
# 'distro': 'Fedora-22', 'distro': 'Fedora-22',
# 'disk_size': 6, 'disk_size': 6,
# 'target': 'f[[ release.version_int ]]', 'target': 'f[[ release.version_int ]]',
# 'arches': ['x86_64', 'aarch64', 'ppc64le'], 'arches': ['x86_64', 'aarch64', 'ppc64le'],
# 'install_tree_from': 'https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/', 'install_tree_from': 'https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/',
# 'subvariant': 'AtomicHost', 'subvariant': 'AtomicHost',
# 'failable': ['*'], 'failable': ['*'],
# } }
# }, },
# { {
# 'image-build': { 'image-build': {
# 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')], 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')],
# 'name': 'Fedora-AtomicHost-Vagrant', 'name': 'Fedora-AtomicHost-Vagrant',
# [% if request.name == 'stable' %] [% if request.name == 'stable' %]
# # Use a different version string for the updates vs updates-testing # Use a different version string for the updates vs updates-testing
# # runs so that NVRs don't conflict # runs so that NVRs don't conflict
# 'version': '!VERSION_FROM_VERSION' 'version': '!VERSION_FROM_VERSION'
# [% endif %] [% endif %]
# 'release': '!RELEASE_FROM_DATE_RESPIN' 'release': '!RELEASE_FROM_DATE_RESPIN'
# [% if request.name == 'stable' %] [% if request.name == 'stable' %]
# # Use updates ref to build updates images and testing ref to build # Use updates ref to build updates images and testing ref to build
# # updates-testing images. # updates-testing images.
# # https://pagure.io/fedora-kickstarts/c/899bc45aa1d432ca67372ed112de16c0ea89251c?branch=f29 # https://pagure.io/fedora-kickstarts/c/899bc45aa1d432ca67372ed112de16c0ea89251c?branch=f29
# 'kickstart': 'fedora-atomic-vagrant-updates.ks', 'kickstart': 'fedora-atomic-vagrant-updates.ks',
# [% else %] [% else %]
# 'kickstart': 'fedora-atomic-vagrant-testing.ks', 'kickstart': 'fedora-atomic-vagrant-testing.ks',
# [% endif %] [% endif %]
# 'distro': 'Fedora-22', 'distro': 'Fedora-22',
# 'disk_size': 40, 'disk_size': 40,
# 'target': 'f[[ release.version_int ]]', 'target': 'f[[ release.version_int ]]',
# 'arches': ['x86_64'], 'arches': ['x86_64'],
# 'install_tree_from': 'https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/', 'install_tree_from': 'https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/$arch/os/',
# 'subvariant': 'iiiiAtomicHost', 'subvariant': 'AtomicHost',
# 'failable': ['*'], 'failable': ['*'],
# }, },
# 'factory-parameters': { 'factory-parameters': {
# 'vagrant_sync_directory': '/home/vagrant/sync', 'vagrant_sync_directory': '/home/vagrant/sync',
# } }
# } }
# ] ]
#} }
#
#ostree_installer = [ ostree_installer = [
# ('^AtomicHost$', { ('^AtomicHost$', {
# [% for arch in ['x86_64', 'aarch64', 'ppc64le'] %] [% for arch in ['x86_64', 'aarch64', 'ppc64le'] %]
# '[[ arch ]]': { '[[ arch ]]': {
# "repo": [ "repo": [
# "Everything", "Everything",
# "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/", "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/[[ release.version_int ]]/latest-Fedora-[[ release.version_int ]]/compose/Everything/[[arch]]/os/",
# [% if request.name == 'testing' %] [% if request.name == 'testing' %]
# # In the case of testing, also inject the last stable updates # 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/[[arch]]/os/" "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/[[arch]]/os/"
# [% endif %] [% endif %]
# ], ],
# 'release': None, 'release': None,
# 'rootfs_size': '4', 'rootfs_size': '4',
# 'add_template': ['ostree-based-installer/lorax-configure-repo.tmpl', 'add_template': ['ostree-based-installer/lorax-configure-repo.tmpl',
# 'ostree-based-installer/lorax-embed-repo.tmpl'], 'ostree-based-installer/lorax-embed-repo.tmpl'],
# 'add_template_var': [ 'add_template_var': [
# 'ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/', 'ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/',
# 'ostree_update_repo=https://ostree.fedoraproject.org', 'ostree_update_repo=https://ostree.fedoraproject.org',
# 'ostree_osname=fedora-atomic', 'ostree_osname=fedora-atomic',
# 'ostree_oskey=fedora-[[ release.version_int ]]-primary', 'ostree_oskey=fedora-[[ release.version_int ]]-primary',
# 'ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist', 'ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist',
# 'ostree_install_ref=fedora/[[ release.version_int ]]/[[ arch ]]/[% if request.name == "testing" %]testing[% else %]updates[% endif %]/atomic-host', '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', 'ostree_update_ref=fedora/[[ release.version_int ]]/[[ arch ]]/atomic-host',
# ], ],
# 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
# 'template_branch': 'f[[ release.version_int ]]' 'template_branch': 'f[[ release.version_int ]]'
# 'failable': ['*'], 'failable': ['*'],
# }, },
# [% endfor %] [% endfor %]
# }) })
#] ]
[% endif %] [% endif %]
{% endif %} {% endif %}