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 2022/06/06 08:11:57 UTC

[camel-k] 01/03: fix(e2e): stabilise TestKitTimerToLogFullNativeBuild

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

commit a87819ff08ce857b4faa61a763e7d1b024d11855
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Mon Jun 6 13:59:21 2022 +0900

    fix(e2e): stabilise TestKitTimerToLogFullNativeBuild
---
 e2e/builder/build_test.go   | 6 ++++--
 e2e/support/test_support.go | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go
index 4bb195ba3..455e56c98 100644
--- a/e2e/builder/build_test.go
+++ b/e2e/builder/build_test.go
@@ -30,7 +30,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	. "github.com/apache/camel-k/e2e/support"
-	"github.com/apache/camel-k/pkg/apis/camel/v1"
+	v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
 	"github.com/apache/camel-k/pkg/util/openshift"
 )
 
@@ -56,7 +56,7 @@ func TestKitKnativeFullBuild(t *testing.T) {
 }
 
 func TestKitTimerToLogFullNativeBuild(t *testing.T) {
-	doKitFullBuild(t, "timer-to-log", "4Gi", "15m0s", 2*TestTimeoutLong, kitOptions{
+	doKitFullBuild(t, "timer-to-log", "4Gi", "15m0s", TestTimeoutVeryLong, kitOptions{
 		dependencies: []string{
 			"camel:timer", "camel:log",
 		},
@@ -67,6 +67,8 @@ func TestKitTimerToLogFullNativeBuild(t *testing.T) {
 }
 
 func doKitFullBuild(t *testing.T, name string, memoryLimit string, buildTimeout string, testTimeout time.Duration, options kitOptions) {
+	t.Helper()
+
 	WithNewTestNamespace(t, func(ns string) {
 		strategy := os.Getenv("KAMEL_INSTALL_BUILD_PUBLISH_STRATEGY")
 		ocp, err := openshift.IsOpenShift(TestClient())
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index f337ec7a3..e1e87ec2c 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -91,6 +91,10 @@ const kubeConfigEnvVar = "KUBECONFIG"
 var TestTimeoutShort = 1 * time.Minute
 var TestTimeoutMedium = 5 * time.Minute
 var TestTimeoutLong = 10 * time.Minute
+
+// TestTimeoutVeryLong should be used only for testing native builds.
+var TestTimeoutVeryLong = 30 * time.Minute
+
 var NoOlmOperatorImage string
 
 var TestContext context.Context