From 119db0826e013fda1899589607b89f06be49f9f5 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@fedoraproject.org>
Date: Mon, 27 Jun 2016 06:11:18 +0000
Subject: [PATCH] add f24 ostree configs, fix up some issues

Signed-off-by: Dennis Gilmore <ausil@fedoraproject.org>
---
 .../backend/templates/atomic-config.py.j2     | 60 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/roles/bodhi2/backend/templates/atomic-config.py.j2 b/roles/bodhi2/backend/templates/atomic-config.py.j2
index 12f2ff842f..c2163129e5 100644
--- a/roles/bodhi2/backend/templates/atomic-config.py.j2
+++ b/roles/bodhi2/backend/templates/atomic-config.py.j2
@@ -6,6 +6,61 @@ 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': {},
+        },
+
         'f23-updates': {
             'name': 'f23-updates',
             'repo': 'updates',
@@ -100,7 +155,7 @@ config = dict(
             'treefile': {
                 'include': 'fedora-atomic-docker-host.json',
                 'ref': 'fedora-atomic/f22/x86_64/testing/docker-host',
-                'repos': ['fedora-22', 'updates', 'updates-testing', 'f22-temprepo'],
+                'repos': ['fedora-22', 'updates', 'updates-testing'],
                 'packages': [],
             },
 
@@ -167,7 +222,6 @@ config = dict(
         '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}/',
-	'f22-temprepo': 'file:///mnt/koji/mash/updates/f22-temprepo/',
 {% 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}/',
@@ -193,7 +247,7 @@ config = dict(
 {% endif %}
 
     # The git repo containing our parent treefiles and yum repos
-    git_repo='https://git.fedorahosted.org/git/fedora-atomic.git',
+    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