Merge pull request #329 from edsantiago/ditch_f38

New VMs again, keeping f38

.cirrus.yml

@@ -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
@@ -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
@@ -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
@@ -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

IMG_SFX

@@ -1 +1 @@
-20240215t170000z-f39f38d13
+20240222t143004z-f39f38d13

Makefile

@@ -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)
@@ -134,11 +134,11 @@ IMG_SFX:  timebomb-check ## Generate a new date-based image suffix, store in the
 # Prevent us from wasting CI time when we have expired timebombs
 .PHONY: timebomb-check
 timebomb-check:
-	@now=$$(date +%Y%m%d); \
+	@now=$$(date --utc +%Y%m%d); \
 	    found=; \
 	    while read -r bomb; do \
 	        when=$$(echo "$$bomb" | awk '{print $$2}'); \
-	        if [ $$when -lt $$now ]; then \
+	        if [ $$when -le $$now ]; then \
 	            echo "$$bomb"; \
 	            found=found; \
 	        fi; \

base_images/debian_base-setup.sh

@@ -58,7 +58,7 @@ source "$REPO_DIRPATH/lib.sh"
 # 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 20240222 "workaround for updating debian 12 to 13"
+timebomb 20240226 "workaround for updating debian 12 to 13"
 $SUDO tee /usr/bin/version_find_latest <<"EOF"
 #!/bin/bash
 #
@@ -147,7 +147,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 20240222 "prevent us from getting broken tar-1.35+dfsg-3"
+timebomb 20240226 "prevent us from getting broken tar-1.35+dfsg-3"
 ( set -x; $SUDO apt-mark hold tar; )
 
 echo "Upgrading to SID"
@@ -173,6 +173,10 @@ echo "WARN: This is NOT an official version number.  It's for CI-automation purp
 ( set -x; echo "VERSION_ID=\"$sortable_version\"" | \
     $SUDO tee -a /etc/os-release; )
 
+timebomb 20240226 "pasta 02-20 still not in debian repos"
+$SUDO wget https://passt.top/builds/passt_0.0~git20240220.1e6f92b/passt_0.0~git20240220.1e6f92b-1_amd64.deb
+$SUDO dpkg -i passt_0.0~git20240220.1e6f92b-1_amd64.deb
+
 if ! ((CONTAINER)); then
     custom_cloud_init
     ( set -x; $SUDO systemctl enable rngd; )

cache_images/fedora_packaging.sh

@@ -184,7 +184,6 @@ fi
 DOWNLOAD_PACKAGES=(\
     parallel
     podman-docker
-    podman-plugins
     python3-devel
     python3-pip
     python3-pytest
@@ -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"