facts/yum+dnf+zypper: return repoid in repository facts

kytta · web-flow · commit caa892c47860 · 2025-08-19T13:23:38.000+01:00
diff --git a/pyinfra/facts/dnf.py b/pyinfra/facts/dnf.py
@@ -16,11 +16,15 @@ class DnfRepositories(FactBase):
 
         [
             {
-                "name": "CentOS-$releasever - Apps",
-                "baseurl": "http://mirror.centos.org/$contentdir/$releasever/Apps/$basearch/os/",
-                "gpgcheck": "1",
+                "repoid": "baseos",
+                "name": "AlmaLinux $releasever - BaseOS",
+                "mirrorlist": "https://mirrors.almalinux.org/mirrorlist/$releasever/baseos",
                 "enabled": "1",
-                "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial",
+                "gpgcheck": "1",
+                "countme": "1",
+                "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9",
+                "metadata_expire": "86400",
+                "enabled_metadata": "1"
             },
         ]
     """
diff --git a/pyinfra/facts/util/packaging.py b/pyinfra/facts/util/packaging.py
@@ -32,6 +32,7 @@ def _parse_yum_or_zypper_repositories(output):
                 repos.append(current_repo)
                 current_repo = {}
 
+            current_repo["repoid"] = line[1:-1]
             current_repo["name"] = line[1:-1]
 
         if current_repo and "=" in line:
diff --git a/pyinfra/facts/yum.py b/pyinfra/facts/yum.py
@@ -16,11 +16,15 @@ class YumRepositories(FactBase):
 
         [
             {
-                "name": "CentOS-$releasever - Apps",
-                "baseurl": "http://mirror.centos.org/$contentdir/$releasever/Apps/$basearch/os/",
-                "gpgcheck": "1",
+                "repoid": "baseos",
+                "name": "AlmaLinux $releasever - BaseOS",
+                "mirrorlist": "https://mirrors.almalinux.org/mirrorlist/$releasever/baseos",
                 "enabled": "1",
-                "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial",
+                "gpgcheck": "1",
+                "countme": "1",
+                "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9",
+                "metadata_expire": "86400",
+                "enabled_metadata": "1"
             },
         ]
     """
diff --git a/pyinfra/facts/zypper.py b/pyinfra/facts/zypper.py
@@ -16,11 +16,11 @@ class ZypperRepositories(FactBase):
 
         [
             {
+                "repoid": "repo-oss",
                 "name": "Main Repository",
                 "enabled": "1",
-                "autorefresh": "0",
-                "baseurl": "http://download.opensuse.org/distribution/leap/$releasever/repo/oss/",
-                "type": "rpm-md",
+                "autorefresh": "1",
+                "baseurl": "http://download.opensuse.org/distribution/leap/$releasever/repo/oss/"
             },
         ]
     """
diff --git a/tests/facts/dnf.DnfRepositories/repos-with-spaces.json b/tests/facts/dnf.DnfRepositories/repos-with-spaces.json
@@ -7,6 +7,7 @@
     ],
     "fact": [
         {
+            "repoid": "rhel-atomic-7-cdk-3.6-source-rpms",
             "name": "Red Hat Container Development Kit 3.6 /(Source RPMs)"
         }
     ]
diff --git a/tests/facts/dnf.DnfRepositories/repos.json b/tests/facts/dnf.DnfRepositories/repos.json
@@ -10,10 +10,12 @@
     ],
     "fact": [
         {
+            "repoid": "somerepo",
             "name": "somerepo",
             "baseurl": "abc"
         },
         {
+            "repoid": "anotherrepo",
             "name": "anotherrepo"
         }
     ]
diff --git a/tests/facts/yum.YumRepositories/repos.json b/tests/facts/yum.YumRepositories/repos.json
@@ -10,6 +10,7 @@
     ],
     "fact": [
         {
+            "repoid": "somerepo",
             "name": "somerepo",
             "baseurl": "abc"
         }
diff --git a/tests/facts/zypper.ZypperRepositories/repos.json b/tests/facts/zypper.ZypperRepositories/repos.json
@@ -10,6 +10,7 @@
     ],
     "fact": [
         {
+            "repoid": "somerepo",
             "name": "somerepo",
             "baseurl": "abc"
         }

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,15 @@ class DnfRepositories(FactBase):`
`16`	`16`
`17`	`17`	`[`
`18`	`18`	`{`
`19`		`- "name": "CentOS-$releasever - Apps",`
`20`		`- "baseurl": "http://mirror.centos.org/$contentdir/$releasever/Apps/$basearch/os/",`
`21`		`- "gpgcheck": "1",`
	`19`	`+ "repoid": "baseos",`
	`20`	`+ "name": "AlmaLinux $releasever - BaseOS",`
	`21`	`+ "mirrorlist": "https://mirrors.almalinux.org/mirrorlist/$releasever/baseos",`
`22`	`22`	`"enabled": "1",`
`23`		`- "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial",`
	`23`	`+ "gpgcheck": "1",`
	`24`	`+ "countme": "1",`
	`25`	`+ "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9",`
	`26`	`+ "metadata_expire": "86400",`
	`27`	`+ "enabled_metadata": "1"`
`24`	`28`	`},`
`25`	`29`	`]`
`26`	`30`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,15 @@ class YumRepositories(FactBase):`
`16`	`16`
`17`	`17`	`[`
`18`	`18`	`{`
`19`		`- "name": "CentOS-$releasever - Apps",`
`20`		`- "baseurl": "http://mirror.centos.org/$contentdir/$releasever/Apps/$basearch/os/",`
`21`		`- "gpgcheck": "1",`
	`19`	`+ "repoid": "baseos",`
	`20`	`+ "name": "AlmaLinux $releasever - BaseOS",`
	`21`	`+ "mirrorlist": "https://mirrors.almalinux.org/mirrorlist/$releasever/baseos",`
`22`	`22`	`"enabled": "1",`
`23`		`- "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial",`
	`23`	`+ "gpgcheck": "1",`
	`24`	`+ "countme": "1",`
	`25`	`+ "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9",`
	`26`	`+ "metadata_expire": "86400",`
	`27`	`+ "enabled_metadata": "1"`
`24`	`28`	`},`
`25`	`29`	`]`
`26`	`30`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ class ZypperRepositories(FactBase):`
`16`	`16`
`17`	`17`	`[`
`18`	`18`	`{`
	`19`	`+ "repoid": "repo-oss",`
`19`	`20`	`"name": "Main Repository",`
`20`	`21`	`"enabled": "1",`
`21`		`- "autorefresh": "0",`
`22`		`- "baseurl": "http://download.opensuse.org/distribution/leap/$releasever/repo/oss/",`
`23`		`- "type": "rpm-md",`
	`22`	`+ "autorefresh": "1",`
	`23`	`+ "baseurl": "http://download.opensuse.org/distribution/leap/$releasever/repo/oss/"`
`24`	`24`	`},`
`25`	`25`	`]`
`26`	`26`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`],`
`8`	`8`	`"fact": [`
`9`	`9`	`{`
	`10`	`+ "repoid": "rhel-atomic-7-cdk-3.6-source-rpms",`
`10`	`11`	`"name": "Red Hat Container Development Kit 3.6 /(Source RPMs)"`
`11`	`12`	`}`
`12`	`13`	`]`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,12 @@`
`10`	`10`	`],`
`11`	`11`	`"fact": [`
`12`	`12`	`{`
	`13`	`+ "repoid": "somerepo",`
`13`	`14`	`"name": "somerepo",`
`14`	`15`	`"baseurl": "abc"`
`15`	`16`	`},`
`16`	`17`	`{`
	`18`	`+ "repoid": "anotherrepo",`
`17`	`19`	`"name": "anotherrepo"`
`18`	`20`	`}`
`19`	`21`	`]`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`],`
`11`	`11`	`"fact": [`
`12`	`12`	`{`
	`13`	`+ "repoid": "somerepo",`
`13`	`14`	`"name": "somerepo",`
`14`	`15`	`"baseurl": "abc"`
`15`	`16`	`}`