Take the estate repo name from distro.env
Keeps the test assertions distro-agnostic so a non-el9 matrix entry needs no script edit.
This commit is contained in:
@@ -9,4 +9,7 @@ IMAGE="almalinux9"
|
||||
CA_RPM_URL="http://artifactapi.k8s.syd1.au.unkin.net/api/v1/local/rpm-vendor-el9/Packages/unkin-ca-certificates-2025.7.13-1.el9.x86_64.rpm"
|
||||
CA_RPM_SHA256="c12fb81ea639a92d19506e07e88df290635b15e175b1f8c063d4e8a2d86bab6e"
|
||||
|
||||
# Estate local repo used to prove HTTPS trust and dnf reachability.
|
||||
ESTATE_REPO="rpm-vendor-el9"
|
||||
|
||||
PACKAGES="git jq make python3.11 python3.11-pip python3.12 python3.12-pip uv wget"
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
# out of a .woodpecker matrix, so it silently never gets built.
|
||||
set -uo pipefail
|
||||
|
||||
REQUIRED_KEYS="BASE_IMAGE IMAGE CA_RPM_URL CA_RPM_SHA256 PACKAGES"
|
||||
REQUIRED_KEYS="BASE_IMAGE IMAGE CA_RPM_URL CA_RPM_SHA256 ESTATE_REPO PACKAGES"
|
||||
WORKFLOWS=".woodpecker/build.yaml .woodpecker/test.yaml .woodpecker/docker.yaml"
|
||||
|
||||
fail=0
|
||||
|
||||
@@ -19,14 +19,14 @@ check() {
|
||||
|
||||
# No -k and no --cacert: fails unless the bootstrapped internal CA is in the trust store.
|
||||
check "internal CA trusted (artifactapi)" \
|
||||
curl -fsS -o /dev/null "$ARTIFACTAPI/api/v1/local/rpm-vendor-el9/repodata/repomd.xml"
|
||||
curl -fsS -o /dev/null "$ARTIFACTAPI/api/v1/local/$ESTATE_REPO/repodata/repomd.xml"
|
||||
check "unkin-ca-certificates installed" rpm -q unkin-ca-certificates
|
||||
|
||||
# Every configured repo must refresh, and a package that exists only in the estate's
|
||||
# local repos must resolve.
|
||||
check "dnf refreshes every estate repo" dnf -q makecache --refresh
|
||||
check "dnf resolves an estate-only package" \
|
||||
dnf -q --disablerepo='*' --enablerepo='rpm-vendor*' list --available nfpm
|
||||
dnf -q --disablerepo='*' --enablerepo="$ESTATE_REPO" list --available nfpm
|
||||
|
||||
for p in $PACKAGES; do
|
||||
check "package $p installed" rpm -q "$p"
|
||||
|
||||
Reference in New Issue
Block a user