From e326dc7c07ca1ca8ca2bc6052709889321f02bc1 Mon Sep 17 00:00:00 2001 From: travisn Date: Mon, 31 Jul 2023 16:18:24 -0600 Subject: [PATCH] tests: multi cluster suite toolbox version The toolbox image tag was always being set from #12625 even when the image was not set in the test. If the image is not set, skip replacing the image name to use the default test version. Signed-off-by: travisn (cherry picked from commit c17724b536eaabb19be8d086eca9448ee29905fd) --- tests/framework/installer/ceph_manifests.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index 7e7b206ba..882b36875 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -114,10 +114,12 @@ func (m *CephManifestsMaster) GetToolbox() string { return strings.ReplaceAll(manifest, "app: rook-direct-mount", "app: rook-ceph-tools") } manifest := m.settings.readManifest("toolbox.yaml") - // The toolbox uses the ceph image, so replace the version that is being tested - // The regex allows for any character in the tag ("\S" --> non-whitespace character) - versionRegex := regexp.MustCompile(`image: quay.io/ceph/ceph:\S+`) - manifest = versionRegex.ReplaceAllString(manifest, "image: "+m.settings.CephVersion.Image) + if m.settings.CephVersion.Image != "" { + // The toolbox uses the ceph image, so replace the version that is being tested + // The regex allows for any character in the tag ("\S" --> non-whitespace character) + versionRegex := regexp.MustCompile(`image: quay.io/ceph/ceph:\S+`) + manifest = versionRegex.ReplaceAllString(manifest, "image: "+m.settings.CephVersion.Image) + } return manifest }