From 3a9c1841a823113caed1c5d8835aaa3eb7c31a3a Mon Sep 17 00:00:00 2001 From: Akos Eros Date: Mon, 29 Jun 2026 14:41:55 +0200 Subject: [PATCH 1/3] feat: Add a common makefile target to run CI tests --- src/internal/embedded/resources/Makefile-common | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/internal/embedded/resources/Makefile-common b/src/internal/embedded/resources/Makefile-common index 79bcf80..36cae53 100644 --- a/src/internal/embedded/resources/Makefile-common +++ b/src/internal/embedded/resources/Makefile-common @@ -52,3 +52,7 @@ validate-schema: ## validates values files against schema in common/clustergroup .PHONY: argo-healthcheck argo-healthcheck: ## Checks if all argo applications are synced @$(ANSIBLE_RUN) rhvp.cluster_utils.argo_healthcheck + +.PHONY: run-ci-tests +run-ci-tests: ## To run ci-tests, set any needed env vars + @$(ANSIBLE_RUN) rhvp.cluster_utils.run_ci_tests From 399a382b504e2b124b206659db009efbd782fe17 Mon Sep 17 00:00:00 2001 From: Akos Eros Date: Mon, 29 Jun 2026 14:43:03 +0200 Subject: [PATCH 2/3] feat: add the fn to check if the script is already running in a container This is needed for CI runs, where we do not want container in container --- src/internal/embedded/resources/pattern.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/internal/embedded/resources/pattern.sh b/src/internal/embedded/resources/pattern.sh index 85c9905..78670a2 100755 --- a/src/internal/embedded/resources/pattern.sh +++ b/src/internal/embedded/resources/pattern.sh @@ -9,6 +9,19 @@ function version { echo "$1" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }' } +# We need this check mostly for CI testing, we do not want to run container in container +function is_container() { + [ -n "${KUBERNETES_SERVICE_HOST:-}" ] && return 0 + [ -f /.dockerenv ] && return 0 + [ -f /run/.containerenv ] && return 0 + return 1 +} + +if is_container; then + echo "Already running in a container" + exec "$@" +fi + if [ -z "${PATTERN_UTILITY_CONTAINER:-}" ]; then PATTERN_UTILITY_CONTAINER="quay.io/validatedpatterns/utility-container" fi From c14aeccd2bb2c1889fc7d44c291347a74576c35d Mon Sep 17 00:00:00 2001 From: Akos Eros Date: Mon, 29 Jun 2026 14:55:04 +0200 Subject: [PATCH 3/3] feat: Add wildcard VP_ env vars Any new feature could make and use VP_ prefixed env vars w/o any further change needed. --- src/internal/embedded/resources/pattern.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/internal/embedded/resources/pattern.sh b/src/internal/embedded/resources/pattern.sh index 78670a2..b2172fd 100755 --- a/src/internal/embedded/resources/pattern.sh +++ b/src/internal/embedded/resources/pattern.sh @@ -128,6 +128,7 @@ podman run -it --rm --pull=newer \ -e TOKEN_SECRET \ -e UUID_FILE \ -e VALUES_SECRET \ + -e 'VP_*' \ "${PKI_HOST_MOUNT_ARGS[@]}" \ -v "$(pwd -P)":"$(pwd -P)" \ -v "${HOME}":"${HOME}" \