From 840bfd580c74fce0ec1eda52c783a007288881d2 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sun, 29 Sep 2019 16:10:27 +0200 Subject: [PATCH] stages/dnf: don't name the repositories The names carry no information, and do not affect the produced image. Generate them instead. Signed-off-by: Tom Gundersen --- README.md | 6 +++--- samples/base-from-yum.json | 6 +++--- samples/base-qcow2.json | 6 +++--- samples/base.json | 6 +++--- stages/org.osbuild.dnf | 8 ++++---- test/pipelines/f30-boot.json | 12 ++++++------ test/pipelines/firewall.json | 6 +++--- test/pipelines/locale.json | 6 +++--- test/pipelines/timezone.json | 6 +++--- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index f2df5d28..c484802f 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,13 @@ assembles it into an image. Pipelines are defined as JSON files like this one: "options": { "releasever": "30", "basearch": "x86_64", - "repos": { - "fedora": { + "repos": [ + { "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" } - }, + ], "packages": [ "@Core", "grub2-pc", "httpd" ] } }, diff --git a/samples/base-from-yum.json b/samples/base-from-yum.json index fceec2d8..1b0fe52f 100644 --- a/samples/base-from-yum.json +++ b/samples/base-from-yum.json @@ -27,13 +27,13 @@ "options": { "releasever": "30", "basearch": "x86_64", - "repos": { - "fedora": { + "repos": [ + { "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" } - }, + ], "packages": [ "@Core", "selinux-policy-targeted", diff --git a/samples/base-qcow2.json b/samples/base-qcow2.json index c3f0c94b..c13ca168 100644 --- a/samples/base-qcow2.json +++ b/samples/base-qcow2.json @@ -6,13 +6,13 @@ "releasever": "30", "basearch": "x86_64", "install_weak_deps": true, - "repos": { - "fedora": { + "repos": [ + { "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" } - }, + ], "packages": [ "@Core", "chrony", diff --git a/samples/base.json b/samples/base.json index 2fe44b36..1a79e9f7 100644 --- a/samples/base.json +++ b/samples/base.json @@ -5,13 +5,13 @@ "options": { "releasever": "30", "basearch": "x86_64", - "repos": { - "fedora": { + "repos": [ + { "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" } - }, + ], "packages": [ "@Core", "selinux-policy-targeted", diff --git a/stages/org.osbuild.dnf b/stages/org.osbuild.dnf index 8fe6e0c1..70e053b6 100755 --- a/stages/org.osbuild.dnf +++ b/stages/org.osbuild.dnf @@ -62,8 +62,8 @@ def main(tree, options): weak_deps = options.get("install_weak_deps", True) with open("/tmp/dnf.conf", "w") as conf: - for repoid, repo in repos.items(): - write_repofile(conf, repoid, repo) + for repoid, repo in enumerate(repos): + write_repofile(conf, f"repo{repoid}", repo) script = f""" set -e @@ -105,10 +105,10 @@ def main(tree, options): subprocess.run(cmd, check=True) # verify metadata checksum - for repoid, repo in repos.items(): + for repoid, repo in enumerate(repos): algorithm, checksum = repo["checksum"].split(":") assert algorithm == "sha256" - cachedir = dnf_cachedir(repoid, repo, releasever, basearch) + cachedir = dnf_cachedir(f"repo{repoid}", repo, releasever, basearch) with open(f"{tree}/var/cache/dnf/{cachedir}/repodata/repomd.xml", "rb") as f: repomd = f.read() assert hashlib.sha256(repomd).hexdigest() == checksum diff --git a/test/pipelines/f30-boot.json b/test/pipelines/f30-boot.json index 3af0bcd8..ee4ee1a8 100644 --- a/test/pipelines/f30-boot.json +++ b/test/pipelines/f30-boot.json @@ -7,13 +7,13 @@ "releasever": "30", "basearch": "x86_64", "install_weak_deps": false, - "repos": { - "fedora": { + "repos": [ + { "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" } - }, + ], "packages": [ "dnf", "e2fsprogs", @@ -32,13 +32,13 @@ "releasever": "30", "basearch": "x86_64", "install_weak_deps": true, - "repos": { - "fedora": { + "repos": [ + { "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" } - }, + ], "packages": [ "@Core", "chrony", diff --git a/test/pipelines/firewall.json b/test/pipelines/firewall.json index c7c82526..7e474375 100644 --- a/test/pipelines/firewall.json +++ b/test/pipelines/firewall.json @@ -5,13 +5,13 @@ "options": { "releasever": "30", "basearch": "x86_64", - "repos": { - "fedora": { + "repos": [ + { "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" } - }, + ], "packages": ["@Core", "firewalld"] } }, diff --git a/test/pipelines/locale.json b/test/pipelines/locale.json index e176be51..b8437524 100644 --- a/test/pipelines/locale.json +++ b/test/pipelines/locale.json @@ -5,13 +5,13 @@ "options": { "releasever": "30", "basearch": "x86_64", - "repos": { - "fedora": { + "repos": [ + { "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" } - }, + ], "packages": ["@Core"] } }, diff --git a/test/pipelines/timezone.json b/test/pipelines/timezone.json index 34800a4a..7aa6b96e 100644 --- a/test/pipelines/timezone.json +++ b/test/pipelines/timezone.json @@ -5,13 +5,13 @@ "options": { "releasever": "30", "basearch": "x86_64", - "repos": { - "fedora": { + "repos": [ + { "metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch", "gpgkey": "F1D8 EC98 F241 AAF2 0DF6 9420 EF3C 111F CFC6 59B9", "checksum": "sha256:9f596e18f585bee30ac41c11fb11a83ed6b11d5b341c1cb56ca4015d7717cb97" } - }, + ], "packages": ["@Core"] } },