New VMs: we need netavark 1.10.2-1.fc40

Also, add "rpm -qa" (fedora) and "dpkg -l" (debian) so Ed's package-version script can get better data. It would be nice if we could save those to an artifact file, but we can't. Signed-off-by: Ed Santiago <[email protected]>
containers · Feb 12, 2024 · 15fe970 · 15fe970
1 parent 5dfa6ae
commit 15fe970
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/IMG_SFX b/IMG_SFX
@@ -1 +1 @@
-20240201t143038z-f39f38d13
+20240212t122113z-f39f38d13
diff --git a/cache_images/fedora_packaging.sh b/cache_images/fedora_packaging.sh
@@ -194,6 +194,12 @@ DOWNLOAD_PACKAGES=(\
 msg "Installing general build/test dependencies"
 bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}"
 
+timebomb 20240214 "Gaaaaaaaaah! Kludge to emergency-get netavark 1.10.3"
+arch=$(uname -m)
+fedoraversion=$(awk -F= '$1 == "VERSION_ID" { print $2 }' </etc/os-release)
+bigto $SUDO dnf install -y https://kojipkgs.fedoraproject.org//packages/netavark/1.10.3/1.fc${fedoraversion}/${arch}/netavark-1.10.3-1.fc${fedoraversion}.${arch}.rpm
+timebomb 20240214 "^^^^^^^^ delete everything above here"
+
 msg "Downloading packages for optional installation at runtime, as needed."
 $SUDO mkdir -p "$PACKAGE_DOWNLOAD_DIR"
 cd "$PACKAGE_DOWNLOAD_DIR"

diff --git a/lib.sh b/lib.sh
@@ -353,7 +353,10 @@ rh_finalize() {
     # Packaging cache is preserved across builds of container images
     $SUDO rm -f /etc/udev/rules.d/*-persistent-*.rules
     $SUDO touch /.unconfigured  # force firstboot to run
-    common_finalize
+
+    echo
+    echo "# PACKAGE LIST"
+    rpm -qa | sort
 }
 
 # Called during VM Image setup, not intended for general use.
@@ -369,7 +372,9 @@ debian_finalize() {
     fi
     set -x
     # Packaging cache is preserved across builds of container images
-    common_finalize
+    # pipe-cat is not a NOP! It prevents using $PAGER and then hanging
+    echo "# PACKAGE LIST"
+    dpkg -l | cat
 }
 
 finalize() {
@@ -382,4 +387,6 @@ finalize() {
     else
         die "Unknown/Unsupported Distro '$OS_RELEASE_ID'"
     fi
+
+    common_finalize
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		20240201t143038z-f39f38d13
		20240212t122113z-f39f38d13