From d9ec223974365f6f5c5db4f7226eb24f93df609e Mon Sep 17 00:00:00 2001 From: Sayan Paul Date: Wed, 27 Sep 2023 15:57:59 +0530 Subject: [PATCH] remove greenboot-default-health-check rpm greenboot-health-checks scripts provided by default is contradicting with some of the edge use cases,like usb installation with no network connectivity.Need to make the scripts more resilient that can cater to generic usecases before adding them as mandatory package. Signed-off-by: Sayan Paul --- pkg/distro/fedora/package_sets.go | 1 - pkg/distro/rhel8/edge.go | 1 - pkg/distro/rhel9/edge.go | 1 - test/data/ansible/check_ostree.yaml | 1 - test/data/ansible/check_ostree_nort.yaml | 1 - 5 files changed, 5 deletions(-) diff --git a/pkg/distro/fedora/package_sets.go b/pkg/distro/fedora/package_sets.go index 4ebcfa7adc..37b8194f00 100644 --- a/pkg/distro/fedora/package_sets.go +++ b/pkg/distro/fedora/package_sets.go @@ -111,7 +111,6 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet { "glibc-minimal-langpack", "gnupg2", "greenboot", - "greenboot-default-health-checks", "gzip", "hostname", "ignition", diff --git a/pkg/distro/rhel8/edge.go b/pkg/distro/rhel8/edge.go index f19ffd2fce..606577d987 100644 --- a/pkg/distro/rhel8/edge.go +++ b/pkg/distro/rhel8/edge.go @@ -270,7 +270,6 @@ func edgeCommitPackageSet(t *imageType) rpmmd.PackageSet { Include: []string{ "fdo-client", "fdo-owner-cli", - "greenboot-default-health-checks", "sos", }, }) diff --git a/pkg/distro/rhel9/edge.go b/pkg/distro/rhel9/edge.go index bea68f8bdc..acaaa3d465 100644 --- a/pkg/distro/rhel9/edge.go +++ b/pkg/distro/rhel9/edge.go @@ -547,7 +547,6 @@ func edgeCommitPackageSet(t *imageType) rpmmd.PackageSet { "clevis-dracut", "clevis-luks", "greenboot", - "greenboot-default-health-checks", "fdo-client", "fdo-owner-cli", "sos", diff --git a/test/data/ansible/check_ostree.yaml b/test/data/ansible/check_ostree.yaml index cfac7aeb65..cb1966f61d 100644 --- a/test/data/ansible/check_ostree.yaml +++ b/test/data/ansible/check_ostree.yaml @@ -614,7 +614,6 @@ - assert: that: - "'greenboot-0' in result_greenboot_packages.stdout" - - "'greenboot-default-health-checks' in result_greenboot_packages.stdout" fail_msg: "Some of greenboot and its related packages are not installed" success_msg: "All greenboot and its related packages are installed" always: diff --git a/test/data/ansible/check_ostree_nort.yaml b/test/data/ansible/check_ostree_nort.yaml index c6e3ba8855..252e886a11 100644 --- a/test/data/ansible/check_ostree_nort.yaml +++ b/test/data/ansible/check_ostree_nort.yaml @@ -333,7 +333,6 @@ - assert: that: - "'greenboot-0' in result_greenboot_packages.stdout" - - "'greenboot-default-health-checks' in result_greenboot_packages.stdout" fail_msg: "Some of greenboot and its related packages are not installed" success_msg: "All greenboot and its related packages are installed" always: