Skip to content

Commit

Permalink
MAJOR: Bump to f40 (from f39), ditching f38
Browse files Browse the repository at this point in the history
Need new pasta. Pasta is no longer built for f38. In fact
pretty much nothing is being bodhi'd on f38 any more.
Executive decision: bump to f40/f39, from f39/f38.

Pasta 2024-02-20 is not yet stable on f39, so add a timebombed
force-install.

Also: podman-plugins is obsolete and does not exist in rawhide.
Ditch it.

Signed-off-by: Ed Santiago <santiago@redhat.com>
  • Loading branch information
edsantiago committed Feb 20, 2024
1 parent 7547b67 commit 94d9c31
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion IMG_SFX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20240215t170000z-f39f38d13
20240220t184333z-f40f39d13
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ if_ci_else = $(if $(findstring true,$(CI)),$(1),$(2))

export CENTOS_STREAM_RELEASE = 8

export FEDORA_RELEASE = 39
export PRIOR_FEDORA_RELEASE = 38
export FEDORA_RELEASE = 40
export PRIOR_FEDORA_RELEASE = 39

# This should always be one-greater than $FEDORA_RELEASE (assuming it's actually the latest)
export RAWHIDE_RELEASE = 40
export RAWHIDE_RELEASE = 41

# See import_images/README.md
export FEDORA_IMPORT_IMG_SFX = $(_IMPORT_IMG_SFX)
Expand Down
10 changes: 9 additions & 1 deletion cache_images/fedora_packaging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ fi
DOWNLOAD_PACKAGES=(\
parallel
podman-docker
podman-plugins
python3-devel
python3-pip
python3-pytest
Expand All @@ -194,6 +193,15 @@ DOWNLOAD_PACKAGES=(\
msg "Installing general build/test dependencies"
bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}"

# 2024-02-20 package needed for podman #21563
timebomb 20240226 "package not yet in stable"
if [[ "$OS_RELEASE_VER" -eq 39 ]]; then
arch=$(uname -m)
bigto $SUDO dnf install -y \
https://kojipkgs.fedoraproject.org/packages/passt/0%5E20240220.g1e6f92b/1.fc39/$arch/passt-0%5E20240220.g1e6f92b-1.fc39.$arch.rpm \
https://kojipkgs.fedoraproject.org/packages/passt/0%5E20240220.g1e6f92b/1.fc39/noarch/passt-selinux-0%5E20240220.g1e6f92b-1.fc39.noarch.rpm
fi

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

0 comments on commit 94d9c31

Please sign in to comment.