[releng] branch for f-22

[Peter Robinson]

commit 4a2520861a74830ed599bb082f61fa859777ee7b
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Feb 10 21:44:35 2015 +0000

    branch for f-22

 scripts/block_retired.py          |    5 +++--
 scripts/buildbranched             |    2 +-
 scripts/find_unblocked_orphans.py |    4 ++--
 scripts/isolate-tag.py            |    2 +-
 scripts/koji-stalk.py             |    4 ++--
 scripts/sync-blocked-primary.py   |    2 +-
 scripts/sync-tagged-primary       |    6 +++---
 7 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/scripts/block_retired.py b/scripts/block_retired.py
index c6f6bbd..ff4f5e6 100755
--- a/scripts/block_retired.py
+++ b/scripts/block_retired.py
@@ -16,7 +16,7 @@ from autosigner import SubjectSMTPHandler
 
 
 log = logging.getLogger(__name__)
-RETIRING_BRANCHES = ["el5", "el6", "epel7", "f21", "master"]
+RETIRING_BRANCHES = ["el5", "el6", "epel7", "f22", "master"]
 PROD_ONLY_BRANCHES = ["el5", "el6", "epel7", "master"]
 
 PRODUCTION_PKGDB = "https://admin.fedoraproject.org/pkgdb"
@@ -35,7 +35,8 @@ class ReleaseMapper(object):
 
         # git branchname, koji tag, pkgdb version
         self.mapping = (
-            ("master", "f22", ""),
+            ("master", "f23", ""),
+            ("f22", "f22", ""),
             ("f21", "f21", ""),
             ("f20", "f20", ""),
             ("f19", "f19", ""),
diff --git a/scripts/buildbranched b/scripts/buildbranched
index dcac91d..19b9363 100755
--- a/scripts/buildbranched
+++ b/scripts/buildbranched
@@ -10,7 +10,7 @@ DATE=$1
 ARCH=$2
 ENVIRONMENT=${3:-production}
 
-BRANCHED="21"
+BRANCHED="22"
 DIST=branched
 COMPSFILE="comps-f${BRANCHED}.xml"
 GIT_BRANCH="f${BRANCHED}"
diff --git a/scripts/find_unblocked_orphans.py b/scripts/find_unblocked_orphans.py
index 94cd4a8..9b1d8af 100755
--- a/scripts/find_unblocked_orphans.py
+++ b/scripts/find_unblocked_orphans.py
@@ -73,8 +73,8 @@ BRANCHED_RELEASE = dict(
     repo='https://kojipkgs.fedoraproject.org/mash/branched/i386/os',
     source_repo='https://kojipkgs.fedoraproject.org/mash/branched/source/'
                 'SRPMS',
-    tag='f21',
-    branch='f21',
+    tag='f22',
+    branch='f22',
     mailto='devel at lists.fedoraproject.org',
 )
 
diff --git a/scripts/isolate-tag.py b/scripts/isolate-tag.py
index b91d63c..54266da 100755
--- a/scripts/isolate-tag.py
+++ b/scripts/isolate-tag.py
@@ -13,7 +13,7 @@
 import koji
 import os
 
-tag = 'f22'
+tag = 'f23'
 
 # Create a koji session
 kojisession = koji.ClientSession('https://koji.fedoraproject.org/kojihub')
diff --git a/scripts/koji-stalk.py b/scripts/koji-stalk.py
index 1255b0c..f404477 100755
--- a/scripts/koji-stalk.py
+++ b/scripts/koji-stalk.py
@@ -39,10 +39,10 @@ parser.add_option("--threads", type="int", default="3",
 ### Begin Configuration ###
 
 # distributions to build for:
-distronames = ['f18', 'f19', 'f20', 'f21']
+distronames = ['f20', 'f21', 'f22', 'f23']
 
 # which is rawhide?
-rawhide = 'f21'
+rawhide = 'f23'
 
 # koji setup
 auth_cert = os.path.expanduser('~/.fedora.cert')
diff --git a/scripts/sync-blocked-primary.py b/scripts/sync-blocked-primary.py
index 755c07c..b57678f 100755
--- a/scripts/sync-blocked-primary.py
+++ b/scripts/sync-blocked-primary.py
@@ -17,7 +17,7 @@ import shutil
 
 # Set some variables
 # Some of these could arguably be passed in as args.
-tags = ['f22', 'f21', 'f20'] # tag to check in koji
+tags = ['f23', 'f22', 'f21', 'f20'] # tag to check in koji
 
 arches = ['arm', 'ppc', 's390']
 
diff --git a/scripts/sync-tagged-primary b/scripts/sync-tagged-primary
index 49f455d..aa5f22d 100755
--- a/scripts/sync-tagged-primary
+++ b/scripts/sync-tagged-primary
@@ -3,9 +3,9 @@
 # Copyright (C) 2013 Red Hat, Inc.
 # SPDX-License-Identifier:      GPL-2.0+
 
-tags_updates="f22 f21-updates f20-updates"
-tags_testing="f21-updates-testing f20-updates-testing"
-tags_candidate="f21-updates-candidate f20-updates-candidate"
+tags_updates="f23 f22-updates f21-updates f20-updates"
+tags_testing="f22-updates-testing f21-updates-testing f20-updates-testing"
+tags_candidate="f22-updates-candidate f21-updates-candidate f20-updates-candidate"
 
 for arch in arm ppc s390
 do