From 9f01ea0e72591631fecce61e18549ce785eeaad7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 16 Sep 2024 18:29:35 +0200 Subject: [PATCH] example,test: update to use new version/release data from dnfjson4 This commit updates the `fragment/grub2.yaml` to use the newly available `packages.os.const.kernel.{release,version,arch}` so that this works for real data and not just the `0-0.noarch` mocks. Also update the reference manifests based on https://github.com/osbuild/images/pull/937 --- example/centos/fragment/grub2.yaml | 2 +- .../centos/9/x86_64/ami/centos_9-x86_64-ami-empty.yaml | 2 +- .../centos/9/x86_64/qcow2/centos_9-x86_64-qcow2-empty.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/example/centos/fragment/grub2.yaml b/example/centos/fragment/grub2.yaml index 7b7523d7..ccfad77d 100644 --- a/example/centos/fragment/grub2.yaml +++ b/example/centos/fragment/grub2.yaml @@ -7,7 +7,7 @@ options: uefi: vendor: centos unified: true - saved_entry: ffffffffffffffffffffffffffffffff-0-0.noarch + saved_entry: ffffffffffffffffffffffffffffffff-${packages.os.const.kernel.version}-${packages.os.const.kernel.release}.${packages.os.const.kernel.arch} write_cmdline: false config: default: saved diff --git a/test/data/images-ref/centos/9/x86_64/ami/centos_9-x86_64-ami-empty.yaml b/test/data/images-ref/centos/9/x86_64/ami/centos_9-x86_64-ami-empty.yaml index 3acd8a88..6932bcba 100644 --- a/test/data/images-ref/centos/9/x86_64/ami/centos_9-x86_64-ami-empty.yaml +++ b/test/data/images-ref/centos/9/x86_64/ami/centos_9-x86_64-ami-empty.yaml @@ -313,7 +313,7 @@ pipelines: uefi: vendor: centos unified: true - saved_entry: ffffffffffffffffffffffffffffffff-0-0.noarch + saved_entry: ffffffffffffffffffffffffffffffff-8-r2.noarch write_cmdline: false config: default: saved diff --git a/test/data/images-ref/centos/9/x86_64/qcow2/centos_9-x86_64-qcow2-empty.yaml b/test/data/images-ref/centos/9/x86_64/qcow2/centos_9-x86_64-qcow2-empty.yaml index 2272e5a1..1de06bf4 100644 --- a/test/data/images-ref/centos/9/x86_64/qcow2/centos_9-x86_64-qcow2-empty.yaml +++ b/test/data/images-ref/centos/9/x86_64/qcow2/centos_9-x86_64-qcow2-empty.yaml @@ -236,7 +236,7 @@ pipelines: uefi: vendor: centos unified: true - saved_entry: ffffffffffffffffffffffffffffffff-0-0.noarch + saved_entry: ffffffffffffffffffffffffffffffff-8-r2.noarch write_cmdline: false config: default: saved