From 7505440c6c6ca4e07f875ccd6cf16112ed677458 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Wed, 13 Jan 2016 22:49:00 +0000 Subject: [PATCH] Revert "bodhi: Temporarily disable f23-updates atomic composes per request of walters" This reverts commit 3e1094c42703b3d4fd914077641b2f13afc7889b. We're apparently good now that this update has reached stable. https://bodhi.fedoraproject.org/updates/FEDORA-2016-987a6d0ebc --- .../backend/templates/atomic-config.py.j2 | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/roles/bodhi2/backend/templates/atomic-config.py.j2 b/roles/bodhi2/backend/templates/atomic-config.py.j2 index 6400262e86..4420ac68e9 100644 --- a/roles/bodhi2/backend/templates/atomic-config.py.j2 +++ b/roles/bodhi2/backend/templates/atomic-config.py.j2 @@ -6,33 +6,33 @@ rhel6 = dist[0] == 'redhat' and int(float(dist[1])) == 6 config = dict( releases={ - #'f23-updates': { - # 'name': 'f23-updates', - # 'repo': 'updates', - # 'version': '23', - # 'arch': 'x86_64', + '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', 'updates'], - # 'packages': [], - # }, + # 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', 'updates'], + 'packages': [], + }, - # # The name of the mock container to build and maintain - # 'mock': 'fedora-23-updates-x86_64', + # 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', + # 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': {}, - #}, + # 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',