Merge branch 'main' into feature/store-i18n

# Conflicts:
#	roles/update/README.md
#	roles/web-app-bluesky/templates/extra_locations.conf.j2
#	roles/web-app-opentalk/templates/nginx/extra.conf.j2
#	scripts/install/filesystem.sh

scripts/install/filesystem.sh

@@ -135,13 +135,13 @@ install_pacman() {
 install_dnf_native() {
 	case "${ID:-}" in
 	fedora)
-		retry_dnf dnf install -y e2fsprogs btrfs-progs
+		retry_dnf dnf --refresh install -y e2fsprogs btrfs-progs
 		return
 		;;
 	esac
 	log "adding EPEL, the only place the EL family carries btrfs-progs"
-	retry_dnf dnf install -y epel-release
-	retry_dnf dnf install -y e2fsprogs btrfs-progs
+	retry_dnf dnf --refresh install -y epel-release
+	retry_dnf dnf --refresh install -y e2fsprogs btrfs-progs
 }
 
 # Param: $1 path segment of the zfsonlinux repository, `fedora` or `epel`
@@ -233,7 +233,7 @@ install_dnf() {
 	log "zfs userland version: ${zfs_version}"
 
 	if ! command -v rpmbuild >/dev/null 2>&1; then
-		retry_dnf dnf install -y rpm-build
+		retry_dnf dnf --refresh install -y rpm-build
 	fi
 
 	local topdir=/tmp/zfs-kmod-container
@@ -261,7 +261,7 @@ SPEC
 	if [ -n "${source_rpm}" ]; then
 		install_zfs_from_source "${source_rpm}" "${before}"
 	else
-		retry_dnf dnf install -y zfs
+		retry_dnf dnf --refresh install -y zfs
 		dnf remove -y zfs-release
 	fi
 

scripts/tests/workspace/compose/01_minimal.sh

@@ -11,8 +11,9 @@ source "${SCRIPT_DIR}/../utils/cache.sh"
 echo "Snapshotting cache counters before the deploy."
 CACHE_BEFORE="$(cache_snapshot)"
 
-echo "Deploying dashboard with all variable (group-conditional) services disabled to speed up the deploy and verify disable= suppresses them from the inventory."
-make compose-deploy mode=reinstall apps="${DASHBOARD_APP}" disable="$(variable_services dashboard javascript)"
+echo "Deploying dashboard with all variable (group-conditional) services disabled, except the asset provider, to speed up the deploy and verify disable= suppresses them from the inventory."
+# Exception: without the asset provider the dashboard loads its logo from the public file.infinito.nexus, which ties this test to that host's uptime; variant 1 pins the provider off, so only round 0 runs here.
+make compose-deploy mode=reinstall apps="${DASHBOARD_APP}" variant=0 disable="$(variable_services dashboard javascript asset)"
 inspect
 
 echo "Actively probing both caches to confirm pull-through works end-to-end."