Issue #5554: Fix pkgdb sync for docker entries - fedora-infrastructure

fedora-infrastructure

#5554 Fix pkgdb sync for docker entries

Closed: Fixed 7 years ago Opened 7 years ago by ralph.

@ausil wrote this up but it didn't get applied since we're in freeze.

I'm adding it here just so we don't lose it (it was in an fpaste):

diff --git a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2 b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
index 38ea282..3423aca 100755
--- a/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
+++ b/roles/bodhi2/backend/templates/owner-sync-pkgdb.j2
@@ -80,12 +80,17 @@ if __name__ == '__main__':
         print "ERROR: no tag specified!\n"
         usage()

-    if tag.startswith('epel'):
-        version = tag.split('epel')[1]
-    elif tag.startswith('f'):
-        version = tag.split('f')[1]
+    if 'docker' in tag:
+        namespace='docker'
+        version = tag.split('-')[0].split('f')[1]
     else:
-        version = tag.split('-')[1][:-1]
+        namespace='rpms'
+        if tag.startswith('epel'):
+            version = tag.split('epel')[1]
+        elif tag.startswith('f'):
+            version = tag.split('f')[1]
+        else:
+            version = tag.split('-')[1][:-1]

     data = requests.get(urljoin(BASEURL, 'api/collections'), verify=VERIFY).json()
     branch_names = set()
@@ -109,7 +114,7 @@ if __name__ == '__main__':
         if version == rawhide:
             reponame = 'master'
         else:
-            reponame = tag
+            reponame = tag.split('-')[0]
 {% if env == 'staging' %}
         arches = ["primary"]
 {% else %}
@@ -120,7 +125,7 @@ if __name__ == '__main__':
         sys.exit(1)

     data = requests.get(urljoin(BASEURL, 'api/vcs?format=json'), verify=VERIFY).json()
-    acls = data['rpms']
+    acls = data[namespace]
     pkgs = {}
     for pkg_name in acls:
         try: