From 16c3e03e691f6aa5b5f036beebcd2b61154d4baf Mon Sep 17 00:00:00 2001 From: Filip Brychta Date: Fri, 25 Oct 2024 16:56:49 +0200 Subject: [PATCH] Ignore istio version suffix used in the downstream builds (#446) The test is expecting to see the same version parsed from versions.yaml and a version string returned by `pilot-discovery version`. This is not the same in downstream builds as we use the `_ossm` suffix. Signed-off-by: Filip Brychta --- tests/e2e/util/common/e2e_utils.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/e2e/util/common/e2e_utils.go b/tests/e2e/util/common/e2e_utils.go index b03cbc251..3f5e9a4c4 100644 --- a/tests/e2e/util/common/e2e_utils.go +++ b/tests/e2e/util/common/e2e_utils.go @@ -55,7 +55,8 @@ var ( // - 1.22.2 // - 1.23.0-rc.1 // - 1.24-alpha.feabc1234 - istiodVersionRegex = regexp.MustCompile(`Version:"([^"]*)"`) + // matching only the version before first '_' which is used in the downstream builds, e.g. "1.23.2_ossm_tp.2" + istiodVersionRegex = regexp.MustCompile(`Version:"([^"_]*)[^"]*"`) k = kubectl.New() )