Skip to content

images: Include the "clevis" package set in Fedora and RHEL images #3955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marusak merged 2 commits into from
Oct 19, 2022
Merged

images: Include the "clevis" package set in Fedora and RHEL images #3955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b83c622
images: Include the "clevis" package set in Fedora and RHEL images
mvollmer Oct 11, 2022
67567ba
images: Update fedora-36 image
Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion images/fedora-36
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fedora-36-d35abd9e826bc63517b6f4fd9bd81703bcbf0bf37f089de0edc49014cf89dfd2.qcow2
fedora-36-cce6d988dabba817b951630555d3121637ce1384268ad136a080043be88b72ff.qcow2
11 changes: 11 additions & 0 deletions images/scripts/fedora.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@ libreport-plugin-bugzilla \
libreport-fedora
"

# These packages are downloaded to the image so that the tests can
# install them on-demand.

PACKAGE_SET_CLEVIS="\
clevis-systemd
clevis-dracut
"

# avoid NM-wait-online hanging on disconnected interfaces
mkdir -p /etc/NetworkManager/conf.d/
printf '[main]\nno-auto-default=*\n' > /etc/NetworkManager/conf.d/noauto.conf
Expand All @@ -131,6 +139,9 @@ fi
dnf $DNF_OPTS -y upgrade
dnf $DNF_OPTS -y install $TEST_PACKAGES $COCKPIT_DEPS $IPA_CLIENT_PACKAGES $ABRT_PACKAGES

mkdir -p /var/lib/package-sets/clevis
dnf $DNF_OPTS download --downloaddir=/var/lib/package-sets/clevis $PACKAGE_SET_CLEVIS

# Pre-install distribution cockpit packages, for testing cockpit extensions offline and for convenient interactive debugging
dnf --setopt=install_weak_deps=False install -y cockpit

Expand Down
11 changes: 11 additions & 0 deletions images/scripts/rhel.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,19 @@ if [ "$IMAGE" = "centos-8-stream" ]; then
TEST_PACKAGES="${TEST_PACKAGES/kpatch-dnf /}"
fi

# These packages are downloaded to the image so that the tests can
# install them on-demand.

PACKAGE_SET_CLEVIS="\
clevis-systemd
clevis-dracut
"

dnf install -y $TEST_PACKAGES $COCKPIT_DEPS $IPA_CLIENT_PACKAGES

mkdir -p /var/lib/package-sets/clevis
dnf download --downloaddir=/var/lib/package-sets/clevis $PACKAGE_SET_CLEVIS

# we only need cloud-init for the initial boot, afterwards it just slows down booting
if rpm -q cloud-init; then
dnf remove -y cloud-init
Expand Down