From 21319520e527df8960c06ef8844cef9db3153d37 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Tue, 16 Feb 2021 11:56:32 +0100 Subject: [PATCH] internal/distro/rhel8: un-exclude subman from edge We aim at shrinking our deps eventually but we need subman for the time being. This patch basically un-exclude subman which was introduced by https://github.com/osbuild/osbuild-composer/pull/893 Signed-off-by: Antonio Murdaca --- internal/distro/rhel84/distro.go | 2 -- test/data/ansible/check_ostree.yaml | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/distro/rhel84/distro.go b/internal/distro/rhel84/distro.go index e4bd27bdf8..b13b2823ef 100644 --- a/internal/distro/rhel84/distro.go +++ b/internal/distro/rhel84/distro.go @@ -816,7 +816,6 @@ func newDistro(isCentos bool) distro.Distro { }, excludedPackages: []string{ "rng-tools", - "subscription-manager", }, enabledServices: []string{ "NetworkManager.service", "firewalld.service", "sshd.service", @@ -870,7 +869,6 @@ func newDistro(isCentos bool) distro.Distro { }, excludedPackages: []string{ "rng-tools", - "subscription-manager", }, enabledServices: []string{ "NetworkManager.service", "firewalld.service", "sshd.service", diff --git a/test/data/ansible/check_ostree.yaml b/test/data/ansible/check_ostree.yaml index 6cafabde42..fc9cf924b0 100644 --- a/test/data/ansible/check_ostree.yaml +++ b/test/data/ansible/check_ostree.yaml @@ -315,6 +315,7 @@ - name: failed count + 1 set_fact: failed_counter: "{{ failed_counter | int + 1 }}" + when: ansible_facts['distribution'] != 'RedHat' and ansible_facts ['distribution_version'] != '8.4' # case: check installed greenboot packages # https://github.com/osbuild/osbuild-composer/blob/master/internal/distro/rhel8/distro.go#L634