PR #1826: old-storage: better feedback, fix AlmaLinux

Author: reidpr

examples/Dockerfile.almalinux_8ch

@@ -16,15 +16,37 @@ FROM almalinux:8
 #
 # 4. Issue #1103: Install libarchive to resolve cmake bug
 #
-# FIXME: This instruction seems to be running afoul of #1679. I’ve re-wrapped
-# it to have fewer continuations in hopes we trigger that less.
+# 5. AlmaLinux lost their GPG key, so manual intervention is required to
+# install current packages [1].
+#
+# [1]: https://almalinux.org/blog/2023-12-20-almalinux-8-key-update/
+RUN rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
 RUN dnf install -y --setopt=install_weak_deps=false \
  epel-release \
- 'dnf-command(config-manager)' \
- && dnf config-manager --enable powertools \
- && dnf install -y --setopt=install_weak_deps=false \
+ 'dnf-command(config-manager)'
+RUN dnf config-manager --enable powertools
+RUN dnf install -y --setopt=install_weak_deps=false \
  dnf-plugin-ovl \
- autoconf automake gcc git libarchive libpng-devel make python3 python3-devel python3-lark-parser python3-requests python3-sphinx python3-sphinx_rtd_theme rpm-build rpmlint rsync squashfs-tools squashfuse wget which \
+ autoconf \
+ automake \
+ gcc \
+ git \
+ libarchive \
+ libpng-devel \
+ make \
+ python3 \
+ python3-devel \
+ python3-lark-parser \
+ python3-requests \
+ python3-sphinx \
+ python3-sphinx_rtd_theme \
+ rpm-build \
+ rpmlint \
+ rsync \
+ squashfs-tools \
+ squashfuse \
+ wget \
+ which \
  && dnf clean all
 
 # Need wheel to install bundled Lark, and the RPM version doesn’t work.

test/old-storage

@@ -77,6 +77,10 @@ else
  oldtars=$(printf '%s ' "$@") # https://www.shellcheck.net/wiki/SC2124
 fi
 
+summary=''
+pass_ct=0
+fail_ct=0
+
 
 ### Main loop
 
@@ -113,9 +117,31 @@ for oldtar in $oldtars; do
  ch-image pull archlinux:latest
 
  INFO "testing"
- ch-test -b ch-image --pedantic=no -s "$scope" all
+ if (ch-test -b ch-image --pedantic=no -s "$scope" all); then
+ pass_ct=$((pass_ct + 1))
+ summary+="😁 ${oldtar}: PASS"$'\n'
+ else
+ fail_ct=$((fail_ct + 1))
+ summary+="🤦 ${oldtar}: FAIL"$'\n'
+ fi
+
 
  INFO "deleting: $storage"
  rm -Rf --one-file-system "$storage"
  [[ ! -d $storage ]]
 done
+
+cat <<EOF
+
+🌻🌻🌻 Summary 🌻🌻🌻
+
+${summary}
+pass: ${pass_ct}
+fail: ${fail_ct}
+EOF
+
+if [[ $fail_ct -gt 0 ]]; then
+ echo
+ fatal_msg 'one or more old storage test suites failed'
+ exit 1
+fi