[camel-k] branch main updated: olm_upgrade_test - use only major.minor.patch to verify csv in ik

[pc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/main by this push:
     new c6ca8df41 olm_upgrade_test - use only major.minor.patch to verify csv in ik
c6ca8df41 is described below

commit c6ca8df41ac0e5ba0ad22c3b72242acca8fddc88
Author: Lucie Krejcirova <lf...@redhat.com>
AuthorDate: Mon Feb 6 17:59:04 2023 +0100

    olm_upgrade_test - use only major.minor.patch to verify csv in ik
---
 e2e/namespace/upgrade/olm_upgrade_test.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/e2e/namespace/upgrade/olm_upgrade_test.go b/e2e/namespace/upgrade/olm_upgrade_test.go
index f15d269d9..7325df3e4 100644
--- a/e2e/namespace/upgrade/olm_upgrade_test.go
+++ b/e2e/namespace/upgrade/olm_upgrade_test.go
@@ -202,8 +202,10 @@ func TestOLMAutomaticUpgrade(t *testing.T) {
 			// Check the Integration version has been upgraded
 			Eventually(IntegrationVersion(ns, name)).Should(ContainSubstring(newIPVersionPrefix))
 
-			// Check the previous kit is not garbage collected
-			Eventually(Kits(ns, KitWithVersion(prevCSVVersion.String()))).Should(HaveLen(1))
+			// Check the previous kit is not garbage collected (skip Build - present in case of respin)
+			prevCSVVersionMajorMinorPatch := fmt.Sprintf("%d.%d.%d",
+				prevCSVVersion.Version.Major, prevCSVVersion.Version.Minor, prevCSVVersion.Version.Patch)
+			Eventually(Kits(ns, KitWithVersion(prevCSVVersionMajorMinorPatch))).Should(HaveLen(1))
 			// Check a new kit is created with the current version
 			Eventually(Kits(ns, KitWithVersion(defaults.Version)),
 				TestTimeoutMedium).Should(HaveLen(1))