Fix apache#1305: fix test to check kit instead of image

e2e/test_support.go

@@ -358,6 +358,16 @@ func integrationSpecProfile(ns string, name string) func() v1.TraitProfile {
 	}
 }
 
+func integrationKit(ns string, name string) func() string {
+	return func() string {
+		it := integration(ns, name)()
+		if it == nil {
+			return ""
+		}
+		return it.Status.Kit
+	}
+}
+
 func setIntegrationVersion(ns string, name string, version string) error {
 	it := integration(ns, name)()
 	if it == nil {

e2e/upgrade_test.go

@@ -60,7 +60,7 @@ func TestIntegrationUpgrade(t *testing.T) {
 		// Run an integration
 		Expect(kamel("run", "-n", ns, "files/js.js").Execute()).Should(BeNil())
 		Eventually(integrationPodPhase(ns, "js"), testTimeoutMedium).Should(Equal(v1.PodRunning))
-		initialImage := integrationPodImage(ns, "js")()
+		initialKit := integrationKit(ns, "js")()
 
 		// Scale the operator down to zero
 		Eventually(scaleOperator(ns, 0)).Should(BeNil())
@@ -88,7 +88,7 @@ func TestIntegrationUpgrade(t *testing.T) {
 		Eventually(integrationVersion(ns, "js")).Should(Equal(defaults.Version))
 		Eventually(kitsWithVersion(ns, "an.older.one")).Should(Equal(1)) // old one is not recycled
 		Eventually(kitsWithVersion(ns, defaults.Version)).Should(Equal(1))
-		Eventually(integrationPodImage(ns, "js"), testTimeoutMedium).ShouldNot(Equal(initialImage)) // rolling deployment triggered
+		Eventually(integrationKit(ns, "js"), testTimeoutMedium).ShouldNot(Equal(initialKit))
 		Eventually(integrationPodPhase(ns, "js"), testTimeoutMedium).Should(Equal(v1.PodRunning))
 	})
 }