You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/01/19 08:48:21 UTC

[camel-k] branch main updated: fix(#3988): Fix flaky E2E test on operator multi tenancy

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 1a6119cb5 fix(#3988): Fix flaky E2E test on operator multi tenancy
1a6119cb5 is described below

commit 1a6119cb5eaf0407cc3c663da45b790be116ef70
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Wed Jan 18 15:53:23 2023 +0100

    fix(#3988): Fix flaky E2E test on operator multi tenancy
    
    - Fix TestOperatorIDFiltering/Operators_can_handoff_scoped_integrations
    - Just set new operator ID, there is no need to explicitly rebuild the integration
    - Avoid race condition between rebuild command and the operator ID update
    - Due to race conditions the test sometimes failed with concurrent resource modification error
---
 e2e/namespace/install/operator_id_filtering_test.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/e2e/namespace/install/operator_id_filtering_test.go b/e2e/namespace/install/operator_id_filtering_test.go
index b142634d2..498618ea9 100644
--- a/e2e/namespace/install/operator_id_filtering_test.go
+++ b/e2e/namespace/install/operator_id_filtering_test.go
@@ -81,8 +81,7 @@ func TestOperatorIDFiltering(t *testing.T) {
 					RegisterTestingT(t)
 
 					Expect(AssignIntegrationToOperator(ns, "moving", operator2)).To(Succeed())
-					Eventually(IntegrationPhase(ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
-					Expect(Kamel("rebuild", "-n", ns, "moving").Execute()).To(Succeed())
+					Eventually(IntegrationPhase(ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseBuildingKit))
 					Eventually(IntegrationPhase(ns, "moving"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
 					Eventually(IntegrationPodPhase(ns, "moving"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
 					Eventually(IntegrationLogs(ns, "moving"), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))