Cirrus: CI VM images w/ newer automation-library

The `v4.3.1` version of the library defines a common
`passthrough_envars()` so it doesn't need to be duplicated in podman and
buildah CI.  It also includes an update to build-push which should make
debugging easier.

Finally, these images include setting of the en_US.UTF-8 locale to enable
removal of a workaroud in a future commit.

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2023-08-23 14:11:14 -04:00
committed by Ed Santiago
parent 2b9c0555f4
commit b28188de22

View File

@ -103,9 +103,6 @@ PASSTHROUGH_ENV_ATSTART='CI|LANG|LC_|TEST'
# List of envariable patterns which can match ANYWHERE in the name # List of envariable patterns which can match ANYWHERE in the name
PASSTHROUGH_ENV_ANYWHERE='_NAME|_FQIN' PASSTHROUGH_ENV_ANYWHERE='_NAME|_FQIN'
# Combine into one
PASSTHROUGH_ENV_RE="(^($PASSTHROUGH_ENV_EXACT)\$)|(^($PASSTHROUGH_ENV_ATSTART))|($PASSTHROUGH_ENV_ANYWHERE)"
# Unsafe env. vars for display # Unsafe env. vars for display
SECRET_ENV_RE='ACCOUNT|GC[EP]..|SSH|PASSWORD|SECRET|TOKEN' SECRET_ENV_RE='ACCOUNT|GC[EP]..|SSH|PASSWORD|SECRET|TOKEN'
@ -121,20 +118,6 @@ set +a
lilto() { err_retry 8 1000 "" "$@"; } # just over 4 minutes max lilto() { err_retry 8 1000 "" "$@"; } # just over 4 minutes max
bigto() { err_retry 7 5670 "" "$@"; } # 12 minutes max bigto() { err_retry 7 5670 "" "$@"; } # 12 minutes max
# Return a list of environment variables that should be passed through
# to lower levels (tests in containers, or via ssh to rootless).
# We return the variable names only, not their values. It is up to our
# caller to reference values.
passthrough_envars(){
local envname
warn "Will pass env. vars. matching the following regex:
$PASSTHROUGH_ENV_RE"
compgen -A variable | \
grep -Ev "SETUP_ENVIRONMENT" | \
grep -Ev "$SECRET_ENV_RE" | \
grep -E "$PASSTHROUGH_ENV_RE"
}
setup_rootless() { setup_rootless() {
req_env_vars GOPATH GOSRC SECRET_ENV_RE req_env_vars GOPATH GOSRC SECRET_ENV_RE