From a9b5df8680c841a8ebc291e7349edaa1cb2e0fd2 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Thu, 6 Aug 2026 12:46:39 +0300 Subject: [PATCH] K8SPG-1101: fix PG_VAR assignment for official PG images --- e2e-tests/vars.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/e2e-tests/vars.sh b/e2e-tests/vars.sh index 635a90d79f..75bb9f2d8b 100755 --- a/e2e-tests/vars.sh +++ b/e2e-tests/vars.sh @@ -31,8 +31,10 @@ fi export IMAGE_BASE=${IMAGE_BASE:-"perconalab/percona-postgresql-operator"} export IMAGE=${IMAGE:-"${IMAGE_BASE}:${VERSION}"} +# Extract major PG version from IMAGE_POSTGRESQL when PG_VER is unset. +# Matches: -ppgN-postgres | -postgresN-community | *:N / *:N.x if [[ ! $PG_VER && $IMAGE_POSTGRESQL ]]; then - pg_version_value=$(echo "$IMAGE_POSTGRESQL" | sed -E 's/.*-(ppg|postgres)([0-9]+).*/\2/') + pg_version_value=$(echo "$IMAGE_POSTGRESQL" | sed -nE 's/.*(-ppg|-postgres|:)([0-9]+)([.-]|$).*/\2/p') export PG_VER="${pg_version_value}" else export PG_VER="${PG_VER:-18}"