Skip to content
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

New VMs: include netavark in prior-fedora #325

Merged
merged 1 commit into from
Feb 1, 2024
Merged

New VMs: include netavark in prior-fedora #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 IMG_SFX
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20240125t184057z-f39f38d13
20240201t143038z-f39f38d13
4 changes: 2 additions & 2 deletions base_images/debian_base-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ echo "Updating package source lists"
# FIXME: 2024-01-02: Bumped the timebomb expiration date because it's
# too hard to find out if it's fixed or not
# 2024-01-25: again
timebomb 20240131 "workaround for updating debian 12 to 13"
timebomb 20240222 "workaround for updating debian 12 to 13"
$SUDO tee /usr/bin/version_find_latest <<"EOF"
#!/bin/bash
#
Expand Down Expand Up @@ -142,7 +142,7 @@ $SUDO chmod 755 /usr/bin/version_find_latest
# https://github.com/containers/podman/issues/19407
# https://bugzilla.redhat.com/show_bug.cgi?id=2230127
# 2024-01-25 dfsg-3 also has the bug
timebomb 20240131 "prevent us from getting broken tar-1.35+dfsg-3"
timebomb 20240222 "prevent us from getting broken tar-1.35+dfsg-3"
( set -x; $SUDO apt-mark hold tar; )

echo "Upgrading to SID"
Expand Down
17 changes: 2 additions & 15 deletions cache_images/fedora_packaging.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,7 @@ INSTALL_PACKAGES=(\
zstd
)

# Test with CNI in Fedora N-1
EXARG=""
if [[ "$PACKER_BUILD_NAME" =~ prior ]]; then
EXARG="--exclude=netavark --exclude=aardvark-dns"
fi

# Rawhide images don't need these pacakges
# Rawhide images don't need these packages
if [[ "$PACKER_BUILD_NAME" =~ fedora ]]; then
INSTALL_PACKAGES+=( \
docker-compose
Expand All @@ -173,13 +167,6 @@ if [[ "$PACKER_BUILD_NAME" =~ fedora ]]; then
)
fi

# Workarond: Around the time of this commit, the `criu` package
# was found to be missing a recommends-dependency on criu-libs.
# Until a fixed rpm lands in the Fedora repositories, manually
# include it here. This workaround should be removed once the
# package is corrected (likely > 3.17.1-3).
INSTALL_PACKAGES+=(criu-libs)

# When installing during a container-build, having this present
# will seriously screw up future dnf operations in very non-obvious ways.
if ! ((CONTAINER)); then
Expand All @@ -205,7 +192,7 @@ DOWNLOAD_PACKAGES=(\
)

msg "Installing general build/test dependencies"
bigto $SUDO dnf install -y $EXARG "${INSTALL_PACKAGES[@]}"
bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}"

msg "Downloading packages for optional installation at runtime, as needed."
$SUDO mkdir -p "$PACKAGE_DOWNLOAD_DIR"
Expand Down