diff --git a/roles/bodhi2/backend/templates/atomic-config.py.j2 b/roles/bodhi2/backend/templates/atomic-config.py.j2 index ba192fa2a9..c2163129e5 100644 --- a/roles/bodhi2/backend/templates/atomic-config.py.j2 +++ b/roles/bodhi2/backend/templates/atomic-config.py.j2 @@ -6,60 +6,60 @@ rhel6 = dist[0] == 'redhat' and int(float(dist[1])) == 6 config = dict( releases={ -# 'f24-updates': { -# 'name': 'f24-updates', -# 'repo': 'updates', -# 'version': '24', -# 'arch': 'x86_64', -# -# # OSTree treefile configuration -# # https://github.com/projectatomic/rpm-ostree/blob/master/doc/treefile.md -# 'tree': 'docker-host', -# 'treefile': { -# 'include': 'fedora-atomic-docker-host.json', -# 'ref': 'fedora-atomic/f24/x86_64/docker-host', -# 'repos': ['fedora-24', 'fedora-24-updates'], -# 'packages': [], -# }, -# -# # The name of the mock container to build and maintain -# 'mock': 'fedora-24-updates-x86_64', -# -# # The git branch to use in the `git_repo` for the parent -# # treefile & repo configurations -# 'git_branch': 'f24', -# -# # Add or overwrite yum repository name:urls. This lets you -# # compose trees against your own repositories. -# 'repos': {}, -# }, -# 'f24-updates-testing': { -# 'name': 'f24-updates-testing', -# 'repo': 'updates-testing', -# 'version': '24', -# 'arch': 'x86_64', -# -# # OSTree treefile configuration -# # https://github.com/projectatomic/rpm-ostree/blob/master/doc/treefile.md -# 'tree': 'docker-host', -# 'treefile': { -# 'include': 'fedora-atomic-docker-host.json', -# 'ref': 'fedora-atomic/f24/x86_64/testing/docker-host', -# 'repos': ['fedora-24', 'fedora-24-updates', 'updates-testing'], -# 'packages': [], -# }, -# -# # The name of the mock container to build and maintain -# 'mock': 'fedora-24-updates-testing-x86_64', -# -# # The git branch to use in the `git_repo` for the parent -# # treefile & repo configurations -# 'git_branch': 'f24', -# -# # Add or overwrite yum repository name:urls. This lets you -# # compose trees against your own repositories. -# 'repos': {}, -# }, + 'f24-updates': { + 'name': 'f24-updates', + 'repo': 'updates', + 'version': '24', + 'arch': 'x86_64', + + # OSTree treefile configuration + # https://github.com/projectatomic/rpm-ostree/blob/master/doc/treefile.md + 'tree': 'docker-host', + 'treefile': { + 'include': 'fedora-atomic-docker-host.json', + 'ref': 'fedora-atomic/f24/x86_64/docker-host', + 'repos': ['fedora-24', 'fedora-24-updates'], + 'packages': [], + }, + + # The name of the mock container to build and maintain + 'mock': 'fedora-24-updates-x86_64', + + # The git branch to use in the `git_repo` for the parent + # treefile & repo configurations + 'git_branch': 'f24', + + # Add or overwrite yum repository name:urls. This lets you + # compose trees against your own repositories. + 'repos': {}, + }, + 'f24-updates-testing': { + 'name': 'f24-updates-testing', + 'repo': 'updates-testing', + 'version': '24', + 'arch': 'x86_64', + + # OSTree treefile configuration + # https://github.com/projectatomic/rpm-ostree/blob/master/doc/treefile.md + 'tree': 'docker-host', + 'treefile': { + 'include': 'fedora-atomic-docker-host.json', + 'ref': 'fedora-atomic/f24/x86_64/testing/docker-host', + 'repos': ['fedora-24', 'fedora-24-updates', 'updates-testing'], + 'packages': [], + }, + + # The name of the mock container to build and maintain + 'mock': 'fedora-24-updates-testing-x86_64', + + # The git branch to use in the `git_repo` for the parent + # treefile & repo configurations + 'git_branch': 'f24', + + # Add or overwrite yum repository name:urls. This lets you + # compose trees against your own repositories. + 'repos': {}, + }, 'f23-updates': { 'name': 'f23-updates',