From 7e4c4e4f6ddde1a58f83731d895eeea14bb4969d Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 12 Dec 2019 19:07:09 +0100 Subject: [PATCH] pipeline/stage/grub2: make the boot uuid optional Signed-off-by: Tom Gundersen --- internal/jobqueue/api_test.go | 2 +- internal/pipeline/grub2_stage.go | 8 ++++---- internal/pipeline/stage_test.go | 22 ++++++++++++++++++++-- test/cases/ami_empty_blueprint.json | 1 - test/cases/disk_empty_blueprint.json | 1 - test/cases/disk_local_boot.json | 1 - test/cases/ext4_empty_blueprint.json | 1 - test/cases/ext4_local_boot.json | 1 - test/cases/openstack_empty_blueprint.json | 1 - test/cases/openstack_local_boot.json | 1 - test/cases/qcow2_empty_blueprint.json | 1 - test/cases/qcow2_local_boot.json | 1 - test/cases/rhel82_ami.json | 1 - test/cases/rhel82_ext4_filesystem.json | 1 - test/cases/rhel82_openstack.json | 1 - test/cases/rhel82_partitioned_disk.json | 1 - test/cases/rhel82_qcow2.json | 1 - test/cases/rhel82_tar.json | 1 - test/cases/rhel82_vhd.json | 1 - test/cases/rhel82_vmdk.json | 1 - test/cases/tar_local_boot.json | 1 - test/cases/vhd_empty_blueprint.json | 1 - test/cases/vhd_local_boot.json | 1 - test/cases/vmdk_empty_blueprint.json | 1 - test/cases/vmdk_local_boot.json | 1 - 25 files changed, 25 insertions(+), 29 deletions(-) diff --git a/internal/jobqueue/api_test.go b/internal/jobqueue/api_test.go index 06cc5ac28..e81ef4bda 100644 --- a/internal/jobqueue/api_test.go +++ b/internal/jobqueue/api_test.go @@ -49,7 +49,7 @@ func TestCreate(t *testing.T) { } test.TestRoute(t, api, false, "POST", "/job-queue/v1/jobs", `{}`, http.StatusCreated, - `{"id":"ffffffff-ffff-ffff-ffff-ffffffffffff","pipeline":{"build":{"pipeline":{"stages":[{"name":"org.osbuild.dnf","options":{"repos":[{"metalink":"https://mirrors.fedoraproject.org/metalink?repo=fedora-30\u0026arch=x86_64","gpgkey":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFturGcBEACv0xBo91V2n0uEC2vh69ywCiSyvUgN/AQH8EZpCVtM7NyjKgKm\nbbY4G3R0M3ir1xXmvUDvK0493/qOiFrjkplvzXFTGpPTi0ypqGgxc5d0ohRA1M75\nL+0AIlXoOgHQ358/c4uO8X0JAA1NYxCkAW1KSJgFJ3RjukrfqSHWthS1d4o8fhHy\nKJKEnirE5hHqB50dafXrBfgZdaOs3C6ppRIePFe2o4vUEapMTCHFw0woQR8Ah4/R\nn7Z9G9Ln+0Cinmy0nbIDiZJ+pgLAXCOWBfDUzcOjDGKvcpoZharA07c0q1/5ojzO\n4F0Fh4g/BUmtrASwHfcIbjHyCSr1j/3Iz883iy07gJY5Yhiuaqmp0o0f9fgHkG53\n2xCU1owmACqaIBNQMukvXRDtB2GJMuKa/asTZDP6R5re+iXs7+s9ohcRRAKGyAyc\nYKIQKcaA+6M8T7/G+TPHZX6HJWqJJiYB+EC2ERblpvq9TPlLguEWcmvjbVc31nyq\nSDoO3ncFWKFmVsbQPTbP+pKUmlLfJwtb5XqxNR5GEXSwVv4I7IqBmJz1MmRafnBZ\ng0FJUtH668GnldO20XbnSVBr820F5SISMXVwCXDXEvGwwiB8Lt8PvqzXnGIFDAu3\nDlQI5sxSqpPVWSyw08ppKT2Tpmy8adiBotLfaCFl2VTHwOae48X2dMPBvQARAQAB\ntDFGZWRvcmEgKDMwKSA8ZmVkb3JhLTMwLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJbbqxnAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRDvPBEfz8ZZudTnD/9170LL3nyTVUCFmBjT9wZ4gYnpwtKVPa/pKnxbbS+Bmmac\ng9TrT9pZbqOHrNJLiZ3Zx1Hp+8uxr3Lo6kbYwImLhkOEDrf4aP17HfQ6VYFbQZI8\nf79OFxWJ7si9+3gfzeh9UYFEqOQfzIjLWFyfnas0OnV/P+RMQ1Zr+vPRqO7AR2va\nN9wg+Xl7157dhXPCGYnGMNSoxCbpRs0JNlzvJMuAea5nTTznRaJZtK/xKsqLn51D\nK07k9MHVFXakOH8QtMCUglbwfTfIpO5YRq5imxlWbqsYWVQy1WGJFyW6hWC0+RcJ\nOx5zGtOfi4/dN+xJ+ibnbyvy/il7Qm+vyFhCYqIPyS5m2UVJUuao3eApE38k78/o\n8aQOTnFQZ+U1Sw+6woFTxjqRQBXlQm2+7Bt3bqGATg4sXXWPbmwdL87Ic+mxn/ml\nSMfQux/5k6iAu1kQhwkO2YJn9eII6HIPkW+2m5N1JsUyJQe4cbtZE5Yh3TRA0dm7\n+zoBRfCXkOW4krchbgww/ptVmzMMP7GINJdROrJnsGl5FVeid9qHzV7aZycWSma7\nCxBYB1J8HCbty5NjtD6XMYRrMLxXugvX6Q4NPPH+2NKjzX4SIDejS6JjgrP3KA3O\npMuo7ZHMfveBngv8yP+ZD/1sS6l+dfExvdaJdOdgFCnp4p3gPbw5+Lv70HrMjA==\n=BfZ/\n-----END PGP PUBLIC KEY BLOCK-----\n","checksum":"test:foo"}],"packages":["dnf","e2fsprogs","grub2-pc","policycoreutils","qemu-img","systemd","tar"],"releasever":"30","basearch":"x86_64"}}]},"runner":"org.osbuild.fedora30"},"stages":[{"name":"org.osbuild.dnf","options":{"repos":[{"metalink":"https://mirrors.fedoraproject.org/metalink?repo=fedora-30\u0026arch=x86_64","gpgkey":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFturGcBEACv0xBo91V2n0uEC2vh69ywCiSyvUgN/AQH8EZpCVtM7NyjKgKm\nbbY4G3R0M3ir1xXmvUDvK0493/qOiFrjkplvzXFTGpPTi0ypqGgxc5d0ohRA1M75\nL+0AIlXoOgHQ358/c4uO8X0JAA1NYxCkAW1KSJgFJ3RjukrfqSHWthS1d4o8fhHy\nKJKEnirE5hHqB50dafXrBfgZdaOs3C6ppRIePFe2o4vUEapMTCHFw0woQR8Ah4/R\nn7Z9G9Ln+0Cinmy0nbIDiZJ+pgLAXCOWBfDUzcOjDGKvcpoZharA07c0q1/5ojzO\n4F0Fh4g/BUmtrASwHfcIbjHyCSr1j/3Iz883iy07gJY5Yhiuaqmp0o0f9fgHkG53\n2xCU1owmACqaIBNQMukvXRDtB2GJMuKa/asTZDP6R5re+iXs7+s9ohcRRAKGyAyc\nYKIQKcaA+6M8T7/G+TPHZX6HJWqJJiYB+EC2ERblpvq9TPlLguEWcmvjbVc31nyq\nSDoO3ncFWKFmVsbQPTbP+pKUmlLfJwtb5XqxNR5GEXSwVv4I7IqBmJz1MmRafnBZ\ng0FJUtH668GnldO20XbnSVBr820F5SISMXVwCXDXEvGwwiB8Lt8PvqzXnGIFDAu3\nDlQI5sxSqpPVWSyw08ppKT2Tpmy8adiBotLfaCFl2VTHwOae48X2dMPBvQARAQAB\ntDFGZWRvcmEgKDMwKSA8ZmVkb3JhLTMwLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJbbqxnAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRDvPBEfz8ZZudTnD/9170LL3nyTVUCFmBjT9wZ4gYnpwtKVPa/pKnxbbS+Bmmac\ng9TrT9pZbqOHrNJLiZ3Zx1Hp+8uxr3Lo6kbYwImLhkOEDrf4aP17HfQ6VYFbQZI8\nf79OFxWJ7si9+3gfzeh9UYFEqOQfzIjLWFyfnas0OnV/P+RMQ1Zr+vPRqO7AR2va\nN9wg+Xl7157dhXPCGYnGMNSoxCbpRs0JNlzvJMuAea5nTTznRaJZtK/xKsqLn51D\nK07k9MHVFXakOH8QtMCUglbwfTfIpO5YRq5imxlWbqsYWVQy1WGJFyW6hWC0+RcJ\nOx5zGtOfi4/dN+xJ+ibnbyvy/il7Qm+vyFhCYqIPyS5m2UVJUuao3eApE38k78/o\n8aQOTnFQZ+U1Sw+6woFTxjqRQBXlQm2+7Bt3bqGATg4sXXWPbmwdL87Ic+mxn/ml\nSMfQux/5k6iAu1kQhwkO2YJn9eII6HIPkW+2m5N1JsUyJQe4cbtZE5Yh3TRA0dm7\n+zoBRfCXkOW4krchbgww/ptVmzMMP7GINJdROrJnsGl5FVeid9qHzV7aZycWSma7\nCxBYB1J8HCbty5NjtD6XMYRrMLxXugvX6Q4NPPH+2NKjzX4SIDejS6JjgrP3KA3O\npMuo7ZHMfveBngv8yP+ZD/1sS6l+dfExvdaJdOdgFCnp4p3gPbw5+Lv70HrMjA==\n=BfZ/\n-----END PGP PUBLIC KEY BLOCK-----\n","checksum":"test:foo"}],"packages":["chrony","firewalld","kernel","langpacks-en","policycoreutils","selinux-policy-targeted"],"exclude_packages":["dracut-config-rescue"],"releasever":"30","basearch":"x86_64"}},{"name":"org.osbuild.fix-bls","options":{}},{"name":"org.osbuild.locale","options":{"language":"en_US"}},{"name":"org.osbuild.grub2","options":{"root_fs_uuid":"76a22bf4-f153-4541-b6c7-0332c0dfaeac","boot_fs_uuid":"00000000-0000-0000-0000-000000000000","kernel_opts":"ro biosdevname=0 net.ifnames=0"}},{"name":"org.osbuild.selinux","options":{"file_contexts":"etc/selinux/targeted/contexts/files/file_contexts"}}],"assembler":{"name":"org.osbuild.tar","options":{"filename":"root.tar.xz","compression":"xz"}}},"targets":[],"output_type":"tar"}`, "created", "uuid") + `{"id":"ffffffff-ffff-ffff-ffff-ffffffffffff","pipeline":{"build":{"pipeline":{"stages":[{"name":"org.osbuild.dnf","options":{"repos":[{"metalink":"https://mirrors.fedoraproject.org/metalink?repo=fedora-30\u0026arch=x86_64","gpgkey":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFturGcBEACv0xBo91V2n0uEC2vh69ywCiSyvUgN/AQH8EZpCVtM7NyjKgKm\nbbY4G3R0M3ir1xXmvUDvK0493/qOiFrjkplvzXFTGpPTi0ypqGgxc5d0ohRA1M75\nL+0AIlXoOgHQ358/c4uO8X0JAA1NYxCkAW1KSJgFJ3RjukrfqSHWthS1d4o8fhHy\nKJKEnirE5hHqB50dafXrBfgZdaOs3C6ppRIePFe2o4vUEapMTCHFw0woQR8Ah4/R\nn7Z9G9Ln+0Cinmy0nbIDiZJ+pgLAXCOWBfDUzcOjDGKvcpoZharA07c0q1/5ojzO\n4F0Fh4g/BUmtrASwHfcIbjHyCSr1j/3Iz883iy07gJY5Yhiuaqmp0o0f9fgHkG53\n2xCU1owmACqaIBNQMukvXRDtB2GJMuKa/asTZDP6R5re+iXs7+s9ohcRRAKGyAyc\nYKIQKcaA+6M8T7/G+TPHZX6HJWqJJiYB+EC2ERblpvq9TPlLguEWcmvjbVc31nyq\nSDoO3ncFWKFmVsbQPTbP+pKUmlLfJwtb5XqxNR5GEXSwVv4I7IqBmJz1MmRafnBZ\ng0FJUtH668GnldO20XbnSVBr820F5SISMXVwCXDXEvGwwiB8Lt8PvqzXnGIFDAu3\nDlQI5sxSqpPVWSyw08ppKT2Tpmy8adiBotLfaCFl2VTHwOae48X2dMPBvQARAQAB\ntDFGZWRvcmEgKDMwKSA8ZmVkb3JhLTMwLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJbbqxnAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRDvPBEfz8ZZudTnD/9170LL3nyTVUCFmBjT9wZ4gYnpwtKVPa/pKnxbbS+Bmmac\ng9TrT9pZbqOHrNJLiZ3Zx1Hp+8uxr3Lo6kbYwImLhkOEDrf4aP17HfQ6VYFbQZI8\nf79OFxWJ7si9+3gfzeh9UYFEqOQfzIjLWFyfnas0OnV/P+RMQ1Zr+vPRqO7AR2va\nN9wg+Xl7157dhXPCGYnGMNSoxCbpRs0JNlzvJMuAea5nTTznRaJZtK/xKsqLn51D\nK07k9MHVFXakOH8QtMCUglbwfTfIpO5YRq5imxlWbqsYWVQy1WGJFyW6hWC0+RcJ\nOx5zGtOfi4/dN+xJ+ibnbyvy/il7Qm+vyFhCYqIPyS5m2UVJUuao3eApE38k78/o\n8aQOTnFQZ+U1Sw+6woFTxjqRQBXlQm2+7Bt3bqGATg4sXXWPbmwdL87Ic+mxn/ml\nSMfQux/5k6iAu1kQhwkO2YJn9eII6HIPkW+2m5N1JsUyJQe4cbtZE5Yh3TRA0dm7\n+zoBRfCXkOW4krchbgww/ptVmzMMP7GINJdROrJnsGl5FVeid9qHzV7aZycWSma7\nCxBYB1J8HCbty5NjtD6XMYRrMLxXugvX6Q4NPPH+2NKjzX4SIDejS6JjgrP3KA3O\npMuo7ZHMfveBngv8yP+ZD/1sS6l+dfExvdaJdOdgFCnp4p3gPbw5+Lv70HrMjA==\n=BfZ/\n-----END PGP PUBLIC KEY BLOCK-----\n","checksum":"test:foo"}],"packages":["dnf","e2fsprogs","grub2-pc","policycoreutils","qemu-img","systemd","tar"],"releasever":"30","basearch":"x86_64"}}]},"runner":"org.osbuild.fedora30"},"stages":[{"name":"org.osbuild.dnf","options":{"repos":[{"metalink":"https://mirrors.fedoraproject.org/metalink?repo=fedora-30\u0026arch=x86_64","gpgkey":"-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFturGcBEACv0xBo91V2n0uEC2vh69ywCiSyvUgN/AQH8EZpCVtM7NyjKgKm\nbbY4G3R0M3ir1xXmvUDvK0493/qOiFrjkplvzXFTGpPTi0ypqGgxc5d0ohRA1M75\nL+0AIlXoOgHQ358/c4uO8X0JAA1NYxCkAW1KSJgFJ3RjukrfqSHWthS1d4o8fhHy\nKJKEnirE5hHqB50dafXrBfgZdaOs3C6ppRIePFe2o4vUEapMTCHFw0woQR8Ah4/R\nn7Z9G9Ln+0Cinmy0nbIDiZJ+pgLAXCOWBfDUzcOjDGKvcpoZharA07c0q1/5ojzO\n4F0Fh4g/BUmtrASwHfcIbjHyCSr1j/3Iz883iy07gJY5Yhiuaqmp0o0f9fgHkG53\n2xCU1owmACqaIBNQMukvXRDtB2GJMuKa/asTZDP6R5re+iXs7+s9ohcRRAKGyAyc\nYKIQKcaA+6M8T7/G+TPHZX6HJWqJJiYB+EC2ERblpvq9TPlLguEWcmvjbVc31nyq\nSDoO3ncFWKFmVsbQPTbP+pKUmlLfJwtb5XqxNR5GEXSwVv4I7IqBmJz1MmRafnBZ\ng0FJUtH668GnldO20XbnSVBr820F5SISMXVwCXDXEvGwwiB8Lt8PvqzXnGIFDAu3\nDlQI5sxSqpPVWSyw08ppKT2Tpmy8adiBotLfaCFl2VTHwOae48X2dMPBvQARAQAB\ntDFGZWRvcmEgKDMwKSA8ZmVkb3JhLTMwLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQI4BBMBAgAiBQJbbqxnAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK\nCRDvPBEfz8ZZudTnD/9170LL3nyTVUCFmBjT9wZ4gYnpwtKVPa/pKnxbbS+Bmmac\ng9TrT9pZbqOHrNJLiZ3Zx1Hp+8uxr3Lo6kbYwImLhkOEDrf4aP17HfQ6VYFbQZI8\nf79OFxWJ7si9+3gfzeh9UYFEqOQfzIjLWFyfnas0OnV/P+RMQ1Zr+vPRqO7AR2va\nN9wg+Xl7157dhXPCGYnGMNSoxCbpRs0JNlzvJMuAea5nTTznRaJZtK/xKsqLn51D\nK07k9MHVFXakOH8QtMCUglbwfTfIpO5YRq5imxlWbqsYWVQy1WGJFyW6hWC0+RcJ\nOx5zGtOfi4/dN+xJ+ibnbyvy/il7Qm+vyFhCYqIPyS5m2UVJUuao3eApE38k78/o\n8aQOTnFQZ+U1Sw+6woFTxjqRQBXlQm2+7Bt3bqGATg4sXXWPbmwdL87Ic+mxn/ml\nSMfQux/5k6iAu1kQhwkO2YJn9eII6HIPkW+2m5N1JsUyJQe4cbtZE5Yh3TRA0dm7\n+zoBRfCXkOW4krchbgww/ptVmzMMP7GINJdROrJnsGl5FVeid9qHzV7aZycWSma7\nCxBYB1J8HCbty5NjtD6XMYRrMLxXugvX6Q4NPPH+2NKjzX4SIDejS6JjgrP3KA3O\npMuo7ZHMfveBngv8yP+ZD/1sS6l+dfExvdaJdOdgFCnp4p3gPbw5+Lv70HrMjA==\n=BfZ/\n-----END PGP PUBLIC KEY BLOCK-----\n","checksum":"test:foo"}],"packages":["chrony","firewalld","kernel","langpacks-en","policycoreutils","selinux-policy-targeted"],"exclude_packages":["dracut-config-rescue"],"releasever":"30","basearch":"x86_64"}},{"name":"org.osbuild.fix-bls","options":{}},{"name":"org.osbuild.locale","options":{"language":"en_US"}},{"name":"org.osbuild.grub2","options":{"root_fs_uuid":"76a22bf4-f153-4541-b6c7-0332c0dfaeac","kernel_opts":"ro biosdevname=0 net.ifnames=0"}},{"name":"org.osbuild.selinux","options":{"file_contexts":"etc/selinux/targeted/contexts/files/file_contexts"}}],"assembler":{"name":"org.osbuild.tar","options":{"filename":"root.tar.xz","compression":"xz"}}},"targets":[],"output_type":"tar"}`, "created", "uuid") } func testUpdateTransition(t *testing.T, from, to string, expectedStatus int) { diff --git a/internal/pipeline/grub2_stage.go b/internal/pipeline/grub2_stage.go index 6c573b597..b4bf557e9 100644 --- a/internal/pipeline/grub2_stage.go +++ b/internal/pipeline/grub2_stage.go @@ -11,9 +11,9 @@ import "github.com/google/uuid" // Note that it is the role of an assembler to install any necessary // bootloaders that are stored in the image outside of any filesystem. type GRUB2StageOptions struct { - RootFilesystemUUID uuid.UUID `json:"root_fs_uuid"` - BootFilesystemUUID uuid.UUID `json:"boot_fs_uuid,omitempty"` - KernelOptions string `json:"kernel_opts,omitempty"` + RootFilesystemUUID uuid.UUID `json:"root_fs_uuid"` + BootFilesystemUUID *uuid.UUID `json:"boot_fs_uuid,omitempty"` + KernelOptions string `json:"kernel_opts,omitempty"` } func (GRUB2StageOptions) isStageOptions() {} @@ -42,7 +42,7 @@ func (options *GRUB2StageOptions) SetRootFilesystemUUID(u uuid.UUID) { // SetBootFilesystemUUID sets the UUID of the filesystem containing /boot. func (options *GRUB2StageOptions) SetBootFilesystemUUID(u uuid.UUID) { - options.BootFilesystemUUID = u + options.BootFilesystemUUID = &u } // SetKernelOptions sets the kernel options that should be passed at boot. diff --git a/internal/pipeline/stage_test.go b/internal/pipeline/stage_test.go index 3093f69a9..ce666d0bb 100644 --- a/internal/pipeline/stage_test.go +++ b/internal/pipeline/stage_test.go @@ -5,9 +5,12 @@ import ( "encoding/json" "reflect" "testing" + + "github.com/google/uuid" ) func TestStage_UnmarshalJSON(t *testing.T) { + null_uuid := uuid.MustParse("00000000-0000-0000-0000-000000000000") type fields struct { Name string Options StageOptions @@ -112,8 +115,23 @@ func TestStage_UnmarshalJSON(t *testing.T) { { name: "grub2", fields: fields{ - Name: "org.osbuild.grub2", - Options: &GRUB2StageOptions{}, + Name: "org.osbuild.grub2", + Options: &GRUB2StageOptions{ + RootFilesystemUUID: null_uuid, + }, + }, + args: args{ + data: []byte(`{"name":"org.osbuild.grub2","options":{"root_fs_uuid":"00000000-0000-0000-0000-000000000000"}}`), + }, + }, + { + name: "grub2-separate-boot", + fields: fields{ + Name: "org.osbuild.grub2", + Options: &GRUB2StageOptions{ + RootFilesystemUUID: null_uuid, + BootFilesystemUUID: &null_uuid, + }, }, args: args{ data: []byte(`{"name":"org.osbuild.grub2","options":{"root_fs_uuid":"00000000-0000-0000-0000-000000000000","boot_fs_uuid":"00000000-0000-0000-0000-000000000000"}}`), diff --git a/test/cases/ami_empty_blueprint.json b/test/cases/ami_empty_blueprint.json index 7100ccc2e..9afc2036a 100644 --- a/test/cases/ami_empty_blueprint.json +++ b/test/cases/ami_empty_blueprint.json @@ -103,7 +103,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro no_timer_check console=ttyS0,115200n8 console=tty1 biosdevname=0 net.ifnames=0 console=ttyS0,115200" } }, diff --git a/test/cases/disk_empty_blueprint.json b/test/cases/disk_empty_blueprint.json index b47133950..1e77299ab 100644 --- a/test/cases/disk_empty_blueprint.json +++ b/test/cases/disk_empty_blueprint.json @@ -96,7 +96,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 net.ifnames=0" } }, diff --git a/test/cases/disk_local_boot.json b/test/cases/disk_local_boot.json index 2644c0a27..5f46f7a81 100644 --- a/test/cases/disk_local_boot.json +++ b/test/cases/disk_local_boot.json @@ -120,7 +120,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 net.ifnames=0" } }, diff --git a/test/cases/ext4_empty_blueprint.json b/test/cases/ext4_empty_blueprint.json index 037a436a5..81722424e 100644 --- a/test/cases/ext4_empty_blueprint.json +++ b/test/cases/ext4_empty_blueprint.json @@ -80,7 +80,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 net.ifnames=0" } }, diff --git a/test/cases/ext4_local_boot.json b/test/cases/ext4_local_boot.json index 45e6c0d60..e9b2980b2 100644 --- a/test/cases/ext4_local_boot.json +++ b/test/cases/ext4_local_boot.json @@ -105,7 +105,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 net.ifnames=0" } }, diff --git a/test/cases/openstack_empty_blueprint.json b/test/cases/openstack_empty_blueprint.json index 51aac27da..2dafe443f 100644 --- a/test/cases/openstack_empty_blueprint.json +++ b/test/cases/openstack_empty_blueprint.json @@ -100,7 +100,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 net.ifnames=0" } }, diff --git a/test/cases/openstack_local_boot.json b/test/cases/openstack_local_boot.json index a4b9ad7af..e14a36c23 100644 --- a/test/cases/openstack_local_boot.json +++ b/test/cases/openstack_local_boot.json @@ -124,7 +124,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 net.ifnames=0" } }, diff --git a/test/cases/qcow2_empty_blueprint.json b/test/cases/qcow2_empty_blueprint.json index 5048a6447..e3273c0f0 100644 --- a/test/cases/qcow2_empty_blueprint.json +++ b/test/cases/qcow2_empty_blueprint.json @@ -101,7 +101,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 net.ifnames=0" } }, diff --git a/test/cases/qcow2_local_boot.json b/test/cases/qcow2_local_boot.json index b7744f5c9..3c658e610 100644 --- a/test/cases/qcow2_local_boot.json +++ b/test/cases/qcow2_local_boot.json @@ -125,7 +125,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 net.ifnames=0" } }, diff --git a/test/cases/rhel82_ami.json b/test/cases/rhel82_ami.json index d0c3dc801..95fabaf10 100644 --- a/test/cases/rhel82_ami.json +++ b/test/cases/rhel82_ami.json @@ -148,7 +148,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto" } }, diff --git a/test/cases/rhel82_ext4_filesystem.json b/test/cases/rhel82_ext4_filesystem.json index 82eeaea60..39d59559f 100644 --- a/test/cases/rhel82_ext4_filesystem.json +++ b/test/cases/rhel82_ext4_filesystem.json @@ -98,7 +98,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro net.ifnames=0" } }, diff --git a/test/cases/rhel82_openstack.json b/test/cases/rhel82_openstack.json index c1748bd90..098a752bf 100644 --- a/test/cases/rhel82_openstack.json +++ b/test/cases/rhel82_openstack.json @@ -106,7 +106,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro net.ifnames=0" } }, diff --git a/test/cases/rhel82_partitioned_disk.json b/test/cases/rhel82_partitioned_disk.json index 87bf0b308..9185ce0cb 100644 --- a/test/cases/rhel82_partitioned_disk.json +++ b/test/cases/rhel82_partitioned_disk.json @@ -112,7 +112,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro net.ifnames=0" } }, diff --git a/test/cases/rhel82_qcow2.json b/test/cases/rhel82_qcow2.json index 46cf19700..af31c08f6 100644 --- a/test/cases/rhel82_qcow2.json +++ b/test/cases/rhel82_qcow2.json @@ -123,7 +123,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro net.ifnames=0" } }, diff --git a/test/cases/rhel82_tar.json b/test/cases/rhel82_tar.json index ad2fcde82..0ffb17c94 100644 --- a/test/cases/rhel82_tar.json +++ b/test/cases/rhel82_tar.json @@ -98,7 +98,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro net.ifnames=0" } }, diff --git a/test/cases/rhel82_vhd.json b/test/cases/rhel82_vhd.json index a1fe9e2dd..34d621003 100644 --- a/test/cases/rhel82_vhd.json +++ b/test/cases/rhel82_vhd.json @@ -111,7 +111,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 rootdelay=300 console=ttyS0 earlyprintk=ttyS0 net.ifnames=0" } }, diff --git a/test/cases/rhel82_vmdk.json b/test/cases/rhel82_vmdk.json index b337595e5..3fd43643f 100644 --- a/test/cases/rhel82_vmdk.json +++ b/test/cases/rhel82_vmdk.json @@ -116,7 +116,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "0bd700f8-090f-4556-b797-b340297ea1bd", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro net.ifnames=0" } }, diff --git a/test/cases/tar_local_boot.json b/test/cases/tar_local_boot.json index dc71a3644..365c01ac6 100644 --- a/test/cases/tar_local_boot.json +++ b/test/cases/tar_local_boot.json @@ -105,7 +105,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 net.ifnames=0" } }, diff --git a/test/cases/vhd_empty_blueprint.json b/test/cases/vhd_empty_blueprint.json index f04da5a52..409b1602b 100644 --- a/test/cases/vhd_empty_blueprint.json +++ b/test/cases/vhd_empty_blueprint.json @@ -99,7 +99,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 net.ifnames=0" } }, diff --git a/test/cases/vhd_local_boot.json b/test/cases/vhd_local_boot.json index cdba75a50..338add4cb 100644 --- a/test/cases/vhd_local_boot.json +++ b/test/cases/vhd_local_boot.json @@ -123,7 +123,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 net.ifnames=0" } }, diff --git a/test/cases/vmdk_empty_blueprint.json b/test/cases/vmdk_empty_blueprint.json index dd00d7076..1efa1a12d 100644 --- a/test/cases/vmdk_empty_blueprint.json +++ b/test/cases/vmdk_empty_blueprint.json @@ -97,7 +97,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 net.ifnames=0" } }, diff --git a/test/cases/vmdk_local_boot.json b/test/cases/vmdk_local_boot.json index 746b61169..0a5991221 100644 --- a/test/cases/vmdk_local_boot.json +++ b/test/cases/vmdk_local_boot.json @@ -121,7 +121,6 @@ "name": "org.osbuild.grub2", "options": { "root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac", - "boot_fs_uuid": "00000000-0000-0000-0000-000000000000", "kernel_opts": "ro biosdevname=0 net.ifnames=0" } },