diff --git a/internal/distro/fedora30/distro.go b/internal/distro/fedora30/distro.go index 8031ca7bb..a03704cb2 100644 --- a/internal/distro/fedora30/distro.go +++ b/internal/distro/fedora30/distro.go @@ -381,10 +381,12 @@ func (r *Fedora30) dnfStageOptions(additionalRepos []rpmmd.RepoConfig, checksums }) } + sort.Strings(packages) for _, pkg := range packages { options.AddPackage(pkg) } + sort.Strings(excludedPackages) for _, pkg := range excludedPackages { options.ExcludePackage(pkg) } @@ -526,7 +528,7 @@ func (r *Fedora30) qemuAssembler(format string, filename string) *pipeline.Assem func (r *Fedora30) tarAssembler(filename, compression string) *pipeline.Assembler { return pipeline.NewTarAssembler( &pipeline.TarAssemblerOptions{ - Filename: filename, + Filename: filename, Compression: compression, }) } diff --git a/internal/distro/rhel82/distro.go b/internal/distro/rhel82/distro.go index 629d66912..d11337bca 100644 --- a/internal/distro/rhel82/distro.go +++ b/internal/distro/rhel82/distro.go @@ -462,10 +462,12 @@ func (r *RHEL82) dnfStageOptions(additionalRepos []rpmmd.RepoConfig, checksums m }) } + sort.Strings(packages) for _, pkg := range packages { options.AddPackage(pkg) } + sort.Strings(excludedPackages) for _, pkg := range excludedPackages { options.ExcludePackage(pkg) } diff --git a/internal/jobqueue/api_test.go b/internal/jobqueue/api_test.go index d93f70dfb..06cc5ac28 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","output_type":"tar","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","policycoreutils","qemu-img","systemd","grub2-pc","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":["policycoreutils","selinux-policy-targeted","kernel","firewalld","chrony","langpacks-en"],"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":{"compression":"xz","filename":"root.tar.xz"}}},"targets":[]}`, "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","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") } func testUpdateTransition(t *testing.T, from, to string, expectedStatus int) { diff --git a/test/cases/ami_empty_blueprint.json b/test/cases/ami_empty_blueprint.json index d3fb931d0..ef585c8c2 100644 --- a/test/cases/ami_empty_blueprint.json +++ b/test/cases/ami_empty_blueprint.json @@ -29,10 +29,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30", @@ -56,16 +56,16 @@ ], "packages": [ "@Core", + "checkpolicy", "chrony", - "kernel", - "selinux-policy-targeted", + "cloud-init", "grub2-pc", + "kernel", "langpacks-en", "libxcrypt-compat", - "xfsprogs", - "cloud-init", - "checkpolicy", - "net-tools" + "net-tools", + "selinux-policy-targeted", + "xfsprogs" ], "exclude_packages": [ "dracut-config-rescue" diff --git a/test/cases/disk_empty_blueprint.json b/test/cases/disk_empty_blueprint.json index c9b5e719f..5f528a071 100644 --- a/test/cases/disk_empty_blueprint.json +++ b/test/cases/disk_empty_blueprint.json @@ -26,10 +26,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30", diff --git a/test/cases/disk_local_boot.json b/test/cases/disk_local_boot.json index e23cf1e38..01d242ab6 100644 --- a/test/cases/disk_local_boot.json +++ b/test/cases/disk_local_boot.json @@ -54,10 +54,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30", diff --git a/test/cases/ext4_empty_blueprint.json b/test/cases/ext4_empty_blueprint.json index 9e080db4f..037a436a5 100644 --- a/test/cases/ext4_empty_blueprint.json +++ b/test/cases/ext4_empty_blueprint.json @@ -26,10 +26,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30", @@ -52,12 +52,12 @@ } ], "packages": [ - "policycoreutils", - "selinux-policy-targeted", - "kernel", - "firewalld", "chrony", - "langpacks-en" + "firewalld", + "kernel", + "langpacks-en", + "policycoreutils", + "selinux-policy-targeted" ], "exclude_packages": [ "dracut-config-rescue" diff --git a/test/cases/ext4_local_boot.json b/test/cases/ext4_local_boot.json index 112e2b7f4..45e6c0d60 100644 --- a/test/cases/ext4_local_boot.json +++ b/test/cases/ext4_local_boot.json @@ -54,10 +54,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30", @@ -80,13 +80,13 @@ } ], "packages": [ - "policycoreutils", - "selinux-policy-targeted", - "kernel", - "firewalld", "chrony", + "firewalld", + "kernel", "langpacks-en", - "openssh-server" + "openssh-server", + "policycoreutils", + "selinux-policy-targeted" ], "exclude_packages": [ "dracut-config-rescue" diff --git a/test/cases/openstack_empty_blueprint.json b/test/cases/openstack_empty_blueprint.json index cfa33627c..3e377c7bc 100644 --- a/test/cases/openstack_empty_blueprint.json +++ b/test/cases/openstack_empty_blueprint.json @@ -26,10 +26,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30", @@ -54,15 +54,15 @@ "packages": [ "@Core", "chrony", - "kernel", - "selinux-policy-targeted", - "grub2-pc", - "spice-vdagent", - "qemu-guest-agent", - "xen-libs", - "langpacks-en", "cloud-init", - "libdrm" + "grub2-pc", + "kernel", + "langpacks-en", + "libdrm", + "qemu-guest-agent", + "selinux-policy-targeted", + "spice-vdagent", + "xen-libs" ], "exclude_packages": [ "dracut-config-rescue" diff --git a/test/cases/openstack_local_boot.json b/test/cases/openstack_local_boot.json index f1736dc28..de584e248 100644 --- a/test/cases/openstack_local_boot.json +++ b/test/cases/openstack_local_boot.json @@ -54,10 +54,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30", @@ -82,15 +82,15 @@ "packages": [ "@Core", "chrony", - "kernel", - "selinux-policy-targeted", - "grub2-pc", - "spice-vdagent", - "qemu-guest-agent", - "xen-libs", - "langpacks-en", "cloud-init", - "libdrm" + "grub2-pc", + "kernel", + "langpacks-en", + "libdrm", + "qemu-guest-agent", + "selinux-policy-targeted", + "spice-vdagent", + "xen-libs" ], "exclude_packages": [ "dracut-config-rescue" diff --git a/test/cases/qcow2_empty_blueprint.json b/test/cases/qcow2_empty_blueprint.json index af2f83841..6d5bcfa95 100644 --- a/test/cases/qcow2_empty_blueprint.json +++ b/test/cases/qcow2_empty_blueprint.json @@ -26,10 +26,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30", @@ -52,14 +52,14 @@ } ], "packages": [ - "kernel-core", "@Fedora Cloud Server", "chrony", - "polkit", - "systemd-udev", - "selinux-policy-targeted", "grub2-pc", - "langpacks-en" + "kernel-core", + "langpacks-en", + "polkit", + "selinux-policy-targeted", + "systemd-udev" ], "exclude_packages": [ "dracut-config-rescue", diff --git a/test/cases/qcow2_local_boot.json b/test/cases/qcow2_local_boot.json index 6c12c4dae..6461a5fc2 100644 --- a/test/cases/qcow2_local_boot.json +++ b/test/cases/qcow2_local_boot.json @@ -54,10 +54,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30", @@ -80,14 +80,14 @@ } ], "packages": [ - "kernel-core", "@Fedora Cloud Server", "chrony", - "polkit", - "systemd-udev", - "selinux-policy-targeted", "grub2-pc", - "langpacks-en" + "kernel-core", + "langpacks-en", + "polkit", + "selinux-policy-targeted", + "systemd-udev" ], "exclude_packages": [ "dracut-config-rescue", diff --git a/test/cases/rhel82_ami.json b/test/cases/rhel82_ami.json index 0e56b81e5..3cf1bfd2d 100644 --- a/test/cases/rhel82_ami.json +++ b/test/cases/rhel82_ami.json @@ -67,12 +67,13 @@ } ], "packages": [ + "@core", + "NetworkManager", "checkpolicy", "chrony", "cloud-init", "cloud-init", "cloud-utils-growpart", - "@core", "dhcp-client", "dracut-config-generic", "gdisk", @@ -81,7 +82,6 @@ "kernel", "langpacks-en", "net-tools", - "NetworkManager", "redhat-release", "redhat-release-eula", "rng-tools", @@ -100,8 +100,8 @@ "firewalld", "iprutils", "ivtv-firmware", - "iwl1000-firmware", "iwl100-firmware", + "iwl1000-firmware", "iwl105-firmware", "iwl135-firmware", "iwl2000-firmware", diff --git a/test/cases/rhel82_ext4_filesystem.json b/test/cases/rhel82_ext4_filesystem.json index 120515f71..82eeaea60 100644 --- a/test/cases/rhel82_ext4_filesystem.json +++ b/test/cases/rhel82_ext4_filesystem.json @@ -73,13 +73,13 @@ } ], "packages": [ - "policycoreutils", - "selinux-policy-targeted", - "kernel", - "firewalld", "chrony", "dracut-config-generic", - "langpacks-en" + "firewalld", + "kernel", + "langpacks-en", + "policycoreutils", + "selinux-policy-targeted" ], "exclude_packages": [ "dracut-config-rescue", diff --git a/test/cases/rhel82_openstack.json b/test/cases/rhel82_openstack.json index 9614855af..979decd94 100644 --- a/test/cases/rhel82_openstack.json +++ b/test/cases/rhel82_openstack.json @@ -68,13 +68,13 @@ ], "packages": [ "@Core", - "grub2-pc", - "langpacks-en", - "dracut-config-generic", - "kernel", - "selinux-policy-targeted", "cloud-init", + "dracut-config-generic", + "grub2-pc", + "kernel", + "langpacks-en", "qemu-guest-agent", + "selinux-policy-targeted", "spice-vdagent" ], "exclude_packages": [ diff --git a/test/cases/rhel82_qcow2.json b/test/cases/rhel82_qcow2.json index 3b957d3be..eb3159678 100644 --- a/test/cases/rhel82_qcow2.json +++ b/test/cases/rhel82_qcow2.json @@ -79,15 +79,15 @@ } ], "packages": [ - "kernel-core", "chrony", "dracut-config-generic", - "polkit", - "systemd-udev", - "selinux-policy-targeted", "grub2-pc", + "kernel-core", "langpacks-en", - "openssh-server" + "openssh-server", + "polkit", + "selinux-policy-targeted", + "systemd-udev" ], "exclude_packages": [ "dracut-config-rescue", diff --git a/test/cases/rhel82_tar.json b/test/cases/rhel82_tar.json index 647b5aaae..ad2fcde82 100644 --- a/test/cases/rhel82_tar.json +++ b/test/cases/rhel82_tar.json @@ -73,13 +73,13 @@ } ], "packages": [ - "policycoreutils", - "selinux-policy-targeted", - "kernel", - "firewalld", "chrony", "dracut-config-generic", - "langpacks-en" + "firewalld", + "kernel", + "langpacks-en", + "policycoreutils", + "selinux-policy-targeted" ], "exclude_packages": [ "dracut-config-rescue", diff --git a/test/cases/rhel82_vhd.json b/test/cases/rhel82_vhd.json index 9291a97a6..756d8392b 100644 --- a/test/cases/rhel82_vhd.json +++ b/test/cases/rhel82_vhd.json @@ -68,18 +68,18 @@ ], "packages": [ "@Core", - "grub2-pc", - "langpacks-en", - "dracut-config-generic", - "kernel", - "selinux-policy-targeted", - "chrony", "WALinuxAgent", - "python3", - "net-tools", + "chrony", "cloud-init", "cloud-utils-growpart", - "gdisk" + "dracut-config-generic", + "gdisk", + "grub2-pc", + "kernel", + "langpacks-en", + "net-tools", + "python3", + "selinux-policy-targeted" ], "exclude_packages": [ "dracut-config-rescue", diff --git a/test/cases/tar_local_boot.json b/test/cases/tar_local_boot.json index a0cf31a8e..dc71a3644 100644 --- a/test/cases/tar_local_boot.json +++ b/test/cases/tar_local_boot.json @@ -54,10 +54,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30", @@ -80,13 +80,13 @@ } ], "packages": [ - "policycoreutils", - "selinux-policy-targeted", - "kernel", - "firewalld", "chrony", + "firewalld", + "kernel", "langpacks-en", - "openssh-server" + "openssh-server", + "policycoreutils", + "selinux-policy-targeted" ], "exclude_packages": [ "dracut-config-rescue" diff --git a/test/cases/vhd_empty_blueprint.json b/test/cases/vhd_empty_blueprint.json index 690c0ca51..6dcd368bb 100644 --- a/test/cases/vhd_empty_blueprint.json +++ b/test/cases/vhd_empty_blueprint.json @@ -26,10 +26,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30", @@ -53,15 +53,15 @@ ], "packages": [ "@Core", + "WALinuxAgent", "chrony", - "kernel", - "selinux-policy-targeted", "grub2-pc", + "kernel", "langpacks-en", + "libxcrypt-compat", "net-tools", "ntfsprogs", - "WALinuxAgent", - "libxcrypt-compat" + "selinux-policy-targeted" ], "exclude_packages": [ "dracut-config-rescue" diff --git a/test/cases/vhd_local_boot.json b/test/cases/vhd_local_boot.json index 7f29f5349..f5278bdc4 100644 --- a/test/cases/vhd_local_boot.json +++ b/test/cases/vhd_local_boot.json @@ -54,10 +54,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30", @@ -81,15 +81,15 @@ ], "packages": [ "@Core", + "WALinuxAgent", "chrony", - "kernel", - "selinux-policy-targeted", "grub2-pc", + "kernel", "langpacks-en", + "libxcrypt-compat", "net-tools", "ntfsprogs", - "WALinuxAgent", - "libxcrypt-compat" + "selinux-policy-targeted" ], "exclude_packages": [ "dracut-config-rescue" diff --git a/test/cases/vmdk_empty_blueprint.json b/test/cases/vmdk_empty_blueprint.json index ac7ddf38b..168a08c52 100644 --- a/test/cases/vmdk_empty_blueprint.json +++ b/test/cases/vmdk_empty_blueprint.json @@ -26,10 +26,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30", diff --git a/test/cases/vmdk_local_boot.json b/test/cases/vmdk_local_boot.json index 74ab98f96..c67371d7e 100644 --- a/test/cases/vmdk_local_boot.json +++ b/test/cases/vmdk_local_boot.json @@ -54,10 +54,10 @@ "packages": [ "dnf", "e2fsprogs", + "grub2-pc", "policycoreutils", "qemu-img", "systemd", - "grub2-pc", "tar" ], "releasever": "30",