scripts/block_retired.py

@@ -23,9 +23,6 @@ PROD_ONLY_BRANCHES = ["el5", "el6", "epel7", "f26", "master"]
 PRODUCTION_PKGDB = "https://admin.fedoraproject.org/pkgdb"
 STAGING_PKGDB = "https://admin.stg.fedoraproject.org/pkgdb"
 
-PRODUCTION_KOJI = "https://koji.fedoraproject.org/kojihub"
-STAGING_KOJI = "https://koji.stg.fedoraproject.org/kojihub"
-
 # pkgdb default namespace
 DEFAULT_NS = "rpms"
 
@@ -40,10 +37,10 @@ class ReleaseMapper(object):
         if namespace == "docker":
             # git branchname, koji tag, epel build tag
             self.mapping = (
-                ("master", "f27docker", ""),
-                ("f26", "f26docker", ""),
-                ("f25", "f25docker", ""),
-                ("f24", "f24docker", ""),
+                ("master", "f27-docker", ""),
+                ("f26", "f26-docker", ""),
+                ("f25", "f25-docker", ""),
+                ("f24", "f24-docker", ""),
             )
         else:
             # git branchname, koji tag, epel build tag
@@ -95,7 +92,6 @@ def get_packages(tag, staging=False):
     profile = PRODUCTION_KOJI_PROFILE if not staging else STAGING_KOJI_PROFILE
     koji_module = koji.get_profile_module(profile)
     kojisession = koji_module.ClientSession(koji_module.config.server)
-    kojisession.krb_login()
     pkglist = kojisession.listPackages(tagID=tag, inherited=True)
     blocked = []
     unblocked = []
@@ -191,8 +187,8 @@ def get_retirement_info(message):
 
 
 def run_koji(koji_params, staging=False):
-    url = PRODUCTION_KOJI if not staging else STAGING_KOJI
-    koji_cmd = ["koji", "--server", url]
+    profile = PRODUCTION_KOJI_PROFILE if not staging else STAGING_KOJI_PROFILE
+    koji_cmd = ["koji", "--profile", profile]
     cmd = koji_cmd + koji_params
     log.debug("Running: %s", " ".join(cmd))
     process = subprocess.Popen(cmd, stderr=subprocess.PIPE,