From 84a102ae9175ea2c770ee15ccd064c9f311352ce Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Fri, 17 Jun 2016 16:13:22 +0000
Subject: [PATCH] Adjust bodhi for f24 0 day updates. This is a normal release
 needed change/task.

---
 .../backend/templates/atomic-config.py.j2     | 54 +++++++++++++++++++
 roles/bodhi2/base/templates/production.ini.j2 | 16 +++---
 2 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/roles/bodhi2/backend/templates/atomic-config.py.j2 b/roles/bodhi2/backend/templates/atomic-config.py.j2
index 12f2ff842f..aa14c2ef09 100644
--- a/roles/bodhi2/backend/templates/atomic-config.py.j2
+++ b/roles/bodhi2/backend/templates/atomic-config.py.j2
@@ -6,6 +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': {},
+        },
         'f23-updates': {
             'name': 'f23-updates',
             'repo': 'updates',
diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 2b004ae6a2..5863fef2f0 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -10,16 +10,16 @@ filter-with = proxy-prefix
 # Release status
 # pre-beta enforces the 'Pre Beta' policy defined here:
 # https://fedoraproject.org/wiki/Updates_Policy
-f24.status = pre_beta
+f25.status = pre_beta
 
-f24.post_beta.mandatory_days_in_testing = 7
-f24.post_beta.critpath.num_admin_approvals = 0
-f24.post_beta.critpath.min_karma = 2
-f24.post_beta.critpath.stable_after_days_without_negative_karma = 14
+f25.post_beta.mandatory_days_in_testing = 7
+f25.post_beta.critpath.num_admin_approvals = 0
+f25.post_beta.critpath.min_karma = 2
+f25.post_beta.critpath.stable_after_days_without_negative_karma = 14
 
-f24.pre_beta.mandatory_days_in_testing = 3
-f24.pre_beta.critpath.num_admin_approvals = 0
-f24.pre_beta.critpath.min_karma = 1
+f25.pre_beta.mandatory_days_in_testing = 3
+f25.pre_beta.critpath.num_admin_approvals = 0
+f25.pre_beta.critpath.min_karma = 1
 
 ##
 ## Atomic OSTree support