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:
@@ -5,5 +5,8 @@ TAG_SUFFIX="alma9"
|
||||
# The default distro also gets the unsuffixed :<version> and :latest tags.
|
||||
DEFAULT="true"
|
||||
|
||||
# Estate local repo used to prove inherited HTTPS trust.
|
||||
ESTATE_REPO="rpm-vendor-el9"
|
||||
|
||||
PACKAGES="golang gcc nfpm"
|
||||
GO_MIN="1.24"
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
# out of a .woodpecker matrix, so it silently never gets built.
|
||||
set -uo pipefail
|
||||
|
||||
REQUIRED_KEYS="BASE_IMAGE_NAME IMAGE TAG_SUFFIX DEFAULT PACKAGES GO_MIN"
|
||||
REQUIRED_KEYS="BASE_IMAGE_NAME IMAGE TAG_SUFFIX DEFAULT ESTATE_REPO PACKAGES GO_MIN"
|
||||
WORKFLOWS=".woodpecker/build.yaml .woodpecker/test.yaml .woodpecker/docker.yaml"
|
||||
|
||||
fail=0
|
||||
|
||||
@@ -19,7 +19,7 @@ check() {
|
||||
|
||||
# Inherited from container-base: no -k and no --cacert.
|
||||
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"
|
||||
|
||||
for p in $PACKAGES; do
|
||||
check "package $p installed" rpm -q "$p"
|
||||
|
||||
Reference in New Issue
Block a user