We used to use this when we used fedmsg-atomic-composer but since the move to pungi I don't think this is used any longer. --- roles/bodhi2/backend/templates/atomic-config.py.j2 | 412 --------------------- 1 file changed, 412 deletions(-) delete mode 100644 roles/bodhi2/backend/templates/atomic-config.py.j2 diff --git a/roles/bodhi2/backend/templates/atomic-config.py.j2 b/roles/bodhi2/backend/templates/atomic-config.py.j2 deleted file mode 100644 index d75269cf2..000000000 --- a/roles/bodhi2/backend/templates/atomic-config.py.j2 +++ /dev/null @@ -1,412 +0,0 @@ -# Check if we're running on RHEL6 and disable -# `mock --new-chroot` and `rpm-ostree --workdir-tmpfs` -import platform -dist = platform.dist() -rhel6 = dist[0] == 'redhat' and int(float(dist[1])) == 6 - -config = dict( - releases={ - 'f26-updates': { - 'name': 'f26-updates', - 'repo': 'updates', - 'version': '26', - 'arch': 'x86_64', - - # OSTree treefile configuration - # https://github.com/projectatomic/rpm-ostree/blob/master/doc/treefile.md - 'tree': 'docker-host', - 'treefile': { - 'include': 'fedora-atomic-host.json', - 'ref': 'fedora/26/x86_64/updates/atomic-host', - 'repos': ['fedora-26', 'fedora-26-updates', 'updates'], - 'packages': [], - }, - - # The name of the mock container to build and maintain - 'mock': 'fedora-26-updates-x86_64', - - # The git branch to use in the `git_repo` for the parent - # treefile & repo configurations - 'git_branch': 'f26', - - # Add or overwrite yum repository name:urls. This lets you - # compose trees against your own repositories. - 'repos': {}, - }, - 'f26-updates-testing': { - 'name': 'f26-updates-testing', - 'repo': 'updates-testing', - 'version': '26', - 'arch': 'x86_64', - - # OSTree treefile configuration - # https://github.com/projectatomic/rpm-ostree/blob/master/doc/treefile.md - 'tree': 'docker-host', - 'treefile': { - 'include': 'fedora-atomic-host.json', - 'ref': 'fedora/26/x86_64/testing/atomic-host', - 'repos': ['fedora-26', 'fedora-26-updates', 'updates-testing'], - 'packages': [], - }, - - # The name of the mock container to build and maintain - 'mock': 'fedora-26-updates-testing-x86_64', - - # The git branch to use in the `git_repo` for the parent - # treefile & repo configurations - 'git_branch': 'f26', - - # Add or overwrite yum repository name:urls. This lets you - # compose trees against your own repositories. - 'repos': {}, - }, - 'f25-updates': { - 'name': 'f25-updates', - 'repo': 'updates', - 'version': '25', - '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/25/x86_64/docker-host', - 'repos': ['fedora-25', 'fedora-25-updates', 'updates'], - 'packages': [], - }, - - # The name of the mock container to build and maintain - 'mock': 'fedora-25-updates-x86_64', - - # The git branch to use in the `git_repo` for the parent - # treefile & repo configurations - 'git_branch': 'f25', - - # Add or overwrite yum repository name:urls. This lets you - # compose trees against your own repositories. - 'repos': {}, - }, - 'f25-updates-testing': { - 'name': 'f25-updates-testing', - 'repo': 'updates-testing', - 'version': '25', - '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/25/x86_64/testing/docker-host', - 'repos': ['fedora-25', 'fedora-25-updates', 'updates-testing'], - 'packages': [], - }, - - # The name of the mock container to build and maintain - 'mock': 'fedora-25-updates-testing-x86_64', - - # The git branch to use in the `git_repo` for the parent - # treefile & repo configurations - 'git_branch': 'f25', - - # 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/24/x86_64/docker-host', - 'repos': ['fedora-24', 'fedora-24-updates', '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/24/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', - 'repo': 'updates', - 'version': '23', - '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/f23/x86_64/docker-host', - 'repos': ['fedora-23', 'fedora-23-updates'], - 'packages': [], - }, - - # The name of the mock container to build and maintain - 'mock': 'fedora-23-updates-x86_64', - - # The git branch to use in the `git_repo` for the parent - # treefile & repo configurations - 'git_branch': 'f23', - - # Add or overwrite yum repository name:urls. This lets you - # compose trees against your own repositories. - 'repos': {}, - }, - 'f23-updates-testing': { - 'name': 'f23-updates-testing', - 'repo': 'updates-testing', - 'version': '23', - '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/f23/x86_64/testing/docker-host', - 'repos': ['fedora-23', 'fedora-23-updates', 'updates-testing'], - 'packages': [], - }, - - # The name of the mock container to build and maintain - 'mock': 'fedora-23-updates-testing-x86_64', - - # The git branch to use in the `git_repo` for the parent - # treefile & repo configurations - 'git_branch': 'f23', - - # Add or overwrite yum repository name:urls. This lets you - # compose trees against your own repositories. - 'repos': {}, - }, - - 'f22-updates': { - 'name': 'f22-updates', - 'repo': 'updates', - 'version': '22', - '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/f22/x86_64/docker-host', - 'repos': ['fedora-22', 'updates'], - 'packages': [], - }, - - # The name of the mock container to build and maintain - 'mock': 'fedora-22-updates-x86_64', - - # The git branch to use in the `git_repo` for the parent - # treefile & repo configurations - 'git_branch': 'f22', - - # Add or overwrite yum repository name:urls. This lets you - # compose trees against your own repositories. - 'repos': {}, - }, - 'f22-updates-testing': { - 'name': 'f22-updates-testing', - 'repo': 'updates-testing', - 'version': '22', - '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/f22/x86_64/testing/docker-host', - 'repos': ['fedora-22', 'updates', 'updates-testing'], - 'packages': [], - }, - - # The name of the mock container to build and maintain - 'mock': 'fedora-22-updates-testing-x86_64', - - # The git branch to use in the `git_repo` for the parent - # treefile & repo configurations - 'git_branch': 'f22', - - # Add or overwrite yum repository name:urls. This lets you - # compose trees against your own repositories. - 'repos': {}, - }, - - 'f21-updates': { - 'name': 'f21-updates', - 'repo': 'updates', - 'version': '21', - '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/f21/x86_64/docker-host', - 'repos': ['fedora-21', 'updates'], - }, - - # The name of the mock container to build and maintain - 'mock': 'fedora-21-updates-x86_64', - - # The git branch to use in the `git_repo` for the parent - # treefile & repo configurations - 'git_branch': 'f21', - - # Add or overwrite yum repository name:urls. This lets you - # compose trees against your own repositories. - 'repos': {}, - }, - - 'f21-updates-testing': { - 'name': 'f21-updates-testing', - 'repo': 'updates-testing', - 'version': '21', - 'arch': 'x86_64', - 'tree': 'docker-host', - 'treefile': { - 'include': 'fedora-atomic-docker-host.json', - 'ref': 'fedora-atomic/f21/x86_64/updates-testing/docker-host', - 'repos': ['fedora-21', 'updates', 'updates-testing'], - }, - 'git_branch': 'f21', - 'mock': 'fedora-21-updates-testing-x86_64', - 'repos': {}, - }, - }, - - # Package repositories to use in the mock container and ostree compose - repos={ -{% if env == 'production' %} - 'fedora-{version}': 'file:///pub/fedora/linux/releases/{version}/Everything/{arch}/os', - 'fedora-{version}-updates': 'file:///pub/fedora/linux/updates/{version}/{arch}/', - 'updates': 'file:///pub/fedora/linux/updates/{version}/{arch}/', - 'updates-testing': 'file:///pub/fedora/linux/updates/testing/{version}/{arch}/', -{% else %} - 'fedora-{version}': 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/{version}/Everything/{arch}/os', - 'updates': 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/{version}/{arch}/', - 'updates-testing': 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/{version}/{arch}/', -{% endif %} - }, - - # Output directories -{% if env == 'production' %} - prod_dir='/mnt/koji/mash/atomic', -{% else %} - prod_dir='/var/cache/bodhi/atomic', -{% endif %} - canonical_dir='{prod_dir}/{version}', - work_dir='/srv/fedora-atomic', - output_dir='{work_dir}/{version}/{arch}/{tree}', - log_dir='{work_dir}/logs/{version}/{arch}/{repo}/{tree}', - -{% if env == 'production' %} - mount_dirs=['/pub/fedora', '/mnt/koji/mash/updates'], -{% else %} - mount_dirs=[], -{% endif %} - - # The git repo containing our parent treefiles and yum repos - git_repo='https://pagure.io/fedora-atomic.git', - git_cache='{work_dir}/fedora-atomic.git', - - # Some branches contain custom .repo files that we don't want to use - delete_repo_files=True, - - # Mock command - mock_cmd='/usr/bin/mock%s-r {mock}' % (rhel6 and ' ' or ' --new-chroot '), - #mock_cmd='/usr/bin/mock -r {mock}', - mock_clean=True, - - # OSTree commands - ostree_init='/usr/bin/ostree --repo={output_dir} init --mode=archive-z2', - ostree_compose='/usr/bin/rpm-ostree compose tree' + - (rhel6 and ' ' or ' --workdir-tmpfs ') + '--repo={output_dir} %s', - ostree_summary='/usr/bin/ostree --repo={output_dir} summary --update', - - # rsync commands -{% if env == 'production' %} - rsync_in_objs='/usr/bin/rsync -rvp --ignore-existing {canonical_dir}/objects/ {output_dir}/objects/', - rsync_in_rest='/usr/bin/rsync -rvp --exclude=objects/ {canonical_dir}/ {output_dir}/', - rsync_out_objs='/usr/bin/rsync -rvp --ignore-existing {output_dir}/objects/ {canonical_dir}/objects/', - rsync_out_rest='/usr/bin/rsync -rvp --exclude=objects/ {output_dir}/ {canonical_dir}/', -{% else %} - rsync_in_objs='', - rsync_in_rest='', - rsync_out_objs='', - rsync_out_rest='', -{% endif %} - - map_to_release=('work_dir', 'prod_dir', 'output_dir', 'log_dir', - 'git_repo', 'git_cache', 'mock_cmd', 'ostree_init', - 'ostree_compose', 'ostree_summary', 'canonical_dir', - 'repos', 'rsync_in_objs', 'rsync_in_rest', 'rsync_out_objs', - 'rsync_out_rest', 'mount_dirs', 'mock_clean', - 'delete_repo_files'), -) - -# Map and expand certain variables to each release -for key in config.get('map_to_release', []): - for name, release in config['releases'].items(): - if isinstance(config[key], dict): - release[key] = {} - for k, v in config[key].items(): - k = k.format(**release) - release[key][k] = v.format(**release) - elif isinstance(config[key], (list, tuple)): - release[key] = [] - for item in config[key]: - release[key].append(item.format(**release)) - elif isinstance(config[key], bool): - release[key] = config[key] - else: - release[key] = config[key].format(**release) -- 2.14.3 _______________________________________________ infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx