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.

Also: jobs are occasionally timing out. Bump up timeouts.

Signed-off-by: Ed Santiago <santiago@redhat.com>
  • Loading branch information
edsantiago committed Feb 21, 2024
1 parent 7547b67 commit a30914a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ image_builder_task:
# Packer needs time to clean up partially created VM images
auto_cancellation: $CI != "true"
stateful: true
timeout_in: 40m
timeout_in: 50m
container:
dockerfile: "image_builder/Containerfile"
cpu: 2
Expand All @@ -69,7 +69,7 @@ container_images_task: &container_images
skip: *ci_docs_tooling
depends_on:
- image_builder
timeout_in: 30m
timeout_in: 40m
gce_instance: &ibi_vm
image_project: "libpod-218412"
# Trust whatever was built most recently is functional
Expand Down Expand Up @@ -115,7 +115,7 @@ imgts_build_task:
skip: &ci_docs $CIRRUS_CHANGE_TITLE =~ '.*CI:DOCS.*'
depends_on:
- image_builder
timeout_in: 20m
timeout_in: 30m
gce_instance: *ibi_vm
env:
<<: *image_env
Expand Down Expand Up @@ -168,7 +168,7 @@ base_images_task:
# Packer needs time to clean up partially created VM images
auto_cancellation: $CI != "true"
stateful: true
timeout_in: 45m
timeout_in: 50m
# Cannot use a container for this task, virt required for fedora image conversion
gce_instance:
<<: *ibi_vm
Expand Down
2 changes: 1 addition & 1 deletion IMG_SFX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20240215t170000z-f39f38d13
20240221t153423z-f39f38d13
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export FEDORA_RELEASE = 39
export PRIOR_FEDORA_RELEASE = 38

# 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
8 changes: 7 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,13 @@ 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"
arch=$(uname -m)
bigto $SUDO dnf install -y \
https://kojipkgs.fedoraproject.org/packages/passt/0%5E20240220.g1e6f92b/1.fc$OS_RELEASE_VER/$arch/passt-0%5E20240220.g1e6f92b-1.fc$OS_RELEASE_VER.$arch.rpm \
https://kojipkgs.fedoraproject.org/packages/passt/0%5E20240220.g1e6f92b/1.fc$OS_RELEASE_VER/noarch/passt-selinux-0%5E20240220.g1e6f92b-1.fc$OS_RELEASE_VER.noarch.rpm

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 a30914a

Please sign in to comment.