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 3c4747aea9b79e59d8e7d914075ca07f4adf9dfa Author: Pasquale Congiusti <[email protected]> AuthorDate: Mon Jul 1 09:44:40 2024 +0200 chore(e2e): proper parallel flags setting --- e2e/advanced/catalog_builder_test.go | 4 +-- e2e/advanced/integration_profile_test.go | 12 -------- e2e/common/cli/bind_test.go | 3 +- e2e/common/cli/config_test.go | 3 +- e2e/common/cli/default.go | 39 ------------------------ e2e/common/cli/delete_test.go | 3 +- e2e/common/cli/describe_test.go | 3 +- e2e/common/cli/dev_mode_test.go | 3 +- e2e/common/cli/get_test.go | 3 +- e2e/common/cli/help_test.go | 3 +- e2e/common/cli/log_test.go | 3 +- e2e/common/cli/offline_commands_test.go | 5 ++- e2e/common/cli/run_test.go | 3 +- e2e/common/cli/version_test.go | 3 +- e2e/common/config/config_reload_test.go | 2 +- e2e/common/config/config_test.go | 2 +- e2e/common/config/kamelet_config_test.go | 2 +- e2e/common/config/pipe_config_test.go | 2 +- e2e/common/languages/groovy_test.go | 2 +- e2e/common/languages/java_test.go | 2 +- e2e/common/languages/js_test.go | 2 +- e2e/common/languages/kotlin_test.go | 2 +- e2e/common/languages/polyglot_test.go | 2 +- e2e/common/languages/xml_test.go | 2 +- e2e/common/languages/yaml_test.go | 2 +- e2e/common/misc/client_test.go | 2 +- e2e/common/misc/cron_test.go | 2 +- e2e/common/misc/integration_fail_test.go | 2 +- e2e/common/misc/integration_trait_update_test.go | 2 +- e2e/common/misc/kamelet_test.go | 2 +- e2e/common/misc/kamelet_update_test.go | 2 +- e2e/common/misc/maven_repository_test.go | 2 +- e2e/common/misc/pipe_test.go | 2 +- e2e/common/misc/rest_test.go | 2 +- e2e/common/misc/scale_integration_test.go | 2 +- e2e/common/misc/structured_logs_test.go | 2 +- e2e/common/runtimes/runtimes_test.go | 2 +- e2e/common/traits/affinity_test.go | 2 +- e2e/common/traits/builder_test.go | 2 +- e2e/common/traits/camel_test.go | 2 +- e2e/common/traits/container_test.go | 2 +- e2e/common/traits/deployment_test.go | 2 +- e2e/common/traits/error_handler_test.go | 2 +- e2e/common/traits/errored_trait_test.go | 2 +- e2e/common/traits/gc_test.go | 2 +- e2e/common/traits/health_test.go | 2 +- e2e/common/traits/istio_test.go | 2 +- e2e/common/traits/jolokia_test.go | 2 +- e2e/common/traits/jvm_test.go | 2 +- e2e/common/traits/kamelet_test.go | 2 +- e2e/common/traits/master_test.go | 2 +- e2e/common/traits/openapi_test.go | 2 +- e2e/common/traits/pdb_test.go | 2 +- e2e/common/traits/pod_test.go | 2 +- e2e/common/traits/prometheus_test.go | 2 +- e2e/common/traits/pull_secret_test.go | 2 +- e2e/common/traits/route_test.go | 2 +- e2e/common/traits/service_binding_test.go | 2 +- e2e/common/traits/service_test.go | 2 +- e2e/common/traits/toleration_test.go | 2 +- script/Makefile | 5 +-- 61 files changed, 74 insertions(+), 113 deletions(-) diff --git a/e2e/advanced/catalog_builder_test.go b/e2e/advanced/catalog_builder_test.go index a9597ca68..552b55b91 100644 --- a/e2e/advanced/catalog_builder_test.go +++ b/e2e/advanced/catalog_builder_test.go @@ -42,9 +42,7 @@ func TestCamelCatalogBuilder(t *testing.T) { WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { InstallOperator(t, ctx, g, ns) g.Eventually(OperatorPod(t, ctx, ns)).ShouldNot(BeNil()) - g.Eventually(Platform(t, ctx, ns)).ShouldNot(BeNil()) - g.Eventually(PlatformConditionStatus(t, ctx, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort). - Should(Equal(corev1.ConditionTrue)) + g.Eventually(PlatformPhase(t, ctx, ns)).Should(Equal(v1.IntegrationPlatformPhaseReady)) catalogName := fmt.Sprintf("camel-catalog-%s", strings.ToLower(defaults.DefaultRuntimeVersion)) g.Eventually(CamelCatalog(t, ctx, ns, catalogName)).ShouldNot(BeNil()) g.Eventually(CamelCatalogPhase(t, ctx, ns, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady)) diff --git a/e2e/advanced/integration_profile_test.go b/e2e/advanced/integration_profile_test.go index ef5eb9bb3..c479113e4 100644 --- a/e2e/advanced/integration_profile_test.go +++ b/e2e/advanced/integration_profile_test.go @@ -104,18 +104,6 @@ func TestIntegrationProfile(t *testing.T) { }), TestTimeoutShort).Should(BeTrue()) g.Expect(Kamel(t, ctx, "delete", "limited", "-n", ns1).Execute()).To(Succeed()) }) - - t.Run("Run integration without integration profile", func(t *testing.T) { - g.Expect(KamelRunWithID(t, ctx, operatorID, ns1, "--name", "normal", "files/yaml.yaml").Execute()).To(Succeed()) - g.Eventually(IntegrationPod(t, ctx, ns1, "normal"), TestTimeoutShort).Should(Not(BeNil())) - g.Eventually(IntegrationPodHas(t, ctx, ns1, "normal", func(pod *corev1.Pod) bool { - if len(pod.Spec.Containers) != 1 { - return false - } - cpuLimits := pod.Spec.Containers[0].Resources.Limits.Cpu() - return cpuLimits == nil || cpuLimits.IsZero() - }), TestTimeoutShort).Should(BeTrue()) - }) }) }) } diff --git a/e2e/common/cli/bind_test.go b/e2e/common/cli/bind_test.go index 0b736412e..2971317ce 100644 --- a/e2e/common/cli/bind_test.go +++ b/e2e/common/cli/bind_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli +package common import ( "context" @@ -34,6 +34,7 @@ import ( ) func TestKamelCLIBind(t *testing.T) { + t.Parallel() WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { kameletName := "test-timer-source" g.Expect(CreateTimerKamelet(t, ctx, ns, kameletName)()).To(Succeed()) diff --git a/e2e/common/cli/config_test.go b/e2e/common/cli/config_test.go index deb385709..78b8131ee 100644 --- a/e2e/common/cli/config_test.go +++ b/e2e/common/cli/config_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli +package common import ( "context" @@ -40,6 +40,7 @@ import ( ) func TestKamelCLIConfig(t *testing.T) { + t.Parallel() WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { t.Run("check default namespace", func(t *testing.T) { _, err := os.Stat(cmd.DefaultConfigLocation) diff --git a/e2e/common/cli/default.go b/e2e/common/cli/default.go deleted file mode 100644 index 8f4ac78b4..000000000 --- a/e2e/common/cli/default.go +++ /dev/null @@ -1,39 +0,0 @@ -//go:build integration -// +build integration - -/* -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to You under the Apache License, Version 2.0 -(the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package cli - -import ( - "github.com/apache/camel-k/v2/e2e/support" - "github.com/apache/camel-k/v2/pkg/platform" - "os" -) - -var operatorNS string -var operatorID string - -func init() { - operatorNS = os.Getenv("CAMEL_K_GLOBAL_OPERATOR_NS") - if operatorNS == "default" { - operatorNS = support.TestDefaultNamespace + "-cli" - } - - operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", platform.DefaultPlatformName+"-cli") -} diff --git a/e2e/common/cli/delete_test.go b/e2e/common/cli/delete_test.go index ab73a5f1f..1b3fc5d54 100644 --- a/e2e/common/cli/delete_test.go +++ b/e2e/common/cli/delete_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli +package common import ( "context" @@ -34,6 +34,7 @@ import ( ) func TestKamelCLIDelete(t *testing.T) { + t.Parallel() WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { t.Run("delete running integration", func(t *testing.T) { g.Expect(KamelRun(t, ctx, ns, "files/yaml.yaml").Execute()).To(Succeed()) diff --git a/e2e/common/cli/describe_test.go b/e2e/common/cli/describe_test.go index 21659b539..6014ddaa4 100644 --- a/e2e/common/cli/describe_test.go +++ b/e2e/common/cli/describe_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli +package common import ( "context" @@ -36,6 +36,7 @@ import ( ) func TestKamelCliDescribe(t *testing.T) { + t.Parallel() WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { g.Expect(KamelRun(t, ctx, ns, "files/yaml.yaml").Execute()).To(Succeed()) g.Eventually(IntegrationPodPhase(t, ctx, ns, "yaml"), TestTimeoutLong).Should(Equal(corev1.PodRunning)) diff --git a/e2e/common/cli/dev_mode_test.go b/e2e/common/cli/dev_mode_test.go index c31f0f13c..30398b9b1 100644 --- a/e2e/common/cli/dev_mode_test.go +++ b/e2e/common/cli/dev_mode_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli +package common import ( "context" @@ -38,6 +38,7 @@ import ( ) func TestRunDevMode(t *testing.T) { + t.Parallel() WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { t.Run("run yaml dev mode", func(t *testing.T) { ctx, cancel := context.WithCancel(ctx) diff --git a/e2e/common/cli/get_test.go b/e2e/common/cli/get_test.go index 18ec7912f..6504b4b9e 100644 --- a/e2e/common/cli/get_test.go +++ b/e2e/common/cli/get_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli +package common import ( "context" @@ -35,6 +35,7 @@ import ( ) func TestKamelCLIGet(t *testing.T) { + t.Parallel() WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { t.Run("get integration", func(t *testing.T) { diff --git a/e2e/common/cli/help_test.go b/e2e/common/cli/help_test.go index c51dd91e4..34eecd561 100644 --- a/e2e/common/cli/help_test.go +++ b/e2e/common/cli/help_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli +package common import ( "testing" @@ -31,6 +31,7 @@ import ( ) func TestKamelCLIHelp(t *testing.T) { + t.Parallel() ctx := TestContext() g := NewWithT(t) diff --git a/e2e/common/cli/log_test.go b/e2e/common/cli/log_test.go index f2e1aa7b3..2fc88de79 100644 --- a/e2e/common/cli/log_test.go +++ b/e2e/common/cli/log_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli +package common import ( "context" @@ -34,6 +34,7 @@ import ( ) func TestKamelCLILog(t *testing.T) { + t.Parallel() WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { t.Run("check integration log", func(t *testing.T) { g.Expect(KamelRun(t, ctx, ns, "files/yaml.yaml", "--name", "log-yaml").Execute()).To(Succeed()) diff --git a/e2e/common/cli/offline_commands_test.go b/e2e/common/cli/offline_commands_test.go index a6d506e40..e18ff3b0f 100644 --- a/e2e/common/cli/offline_commands_test.go +++ b/e2e/common/cli/offline_commands_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli +package common import ( "io" @@ -31,11 +31,13 @@ import ( ) func TestKamelVersionWorksOffline(t *testing.T) { + t.Parallel() g := NewWithT(t) g.Expect(Kamel(t, TestContext(), "version", "--kube-config", "non-existent-kubeconfig-file").Execute()).To(Succeed()) } func TestKamelHelpOptionWorksOffline(t *testing.T) { + t.Parallel() g := NewWithT(t) traitCmd := Kamel(t, TestContext(), "run", "Xxx.java", "--help") @@ -44,6 +46,7 @@ func TestKamelHelpOptionWorksOffline(t *testing.T) { } func TestKamelCompletionWorksOffline(t *testing.T) { + t.Parallel() g := NewWithT(t) bashCmd := Kamel(t, TestContext(), "completion", "bash", "--kube-config", "non-existent-kubeconfig-file") diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go index 7b4e67e67..e251ac52e 100644 --- a/e2e/common/cli/run_test.go +++ b/e2e/common/cli/run_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli +package common import ( "context" @@ -40,6 +40,7 @@ import ( var sampleJar = "https://raw.githubusercontent.com/apache/camel-k/main/e2e/common/traits/files/jvm/sample-1.0.jar"; func TestKamelCLIRun(t *testing.T) { + t.Parallel() WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { t.Run("Examples from GitHub", func(t *testing.T) { diff --git a/e2e/common/cli/version_test.go b/e2e/common/cli/version_test.go index ee9bad90d..0c3e063bb 100644 --- a/e2e/common/cli/version_test.go +++ b/e2e/common/cli/version_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package cli +package common import ( "testing" @@ -32,6 +32,7 @@ import ( ) func TestKamelCLIVersion(t *testing.T) { + t.Parallel() g := NewWithT(t) t.Run("check version correctness", func(t *testing.T) { diff --git a/e2e/common/config/config_reload_test.go b/e2e/common/config/config_reload_test.go index b96805318..37cd52af5 100644 --- a/e2e/common/config/config_reload_test.go +++ b/e2e/common/config/config_reload_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package config +package common import ( "context" diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go index aef0efda6..a74f46f69 100644 --- a/e2e/common/config/config_test.go +++ b/e2e/common/config/config_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package config +package common import ( "context" diff --git a/e2e/common/config/kamelet_config_test.go b/e2e/common/config/kamelet_config_test.go index 7600845ab..ad01df563 100644 --- a/e2e/common/config/kamelet_config_test.go +++ b/e2e/common/config/kamelet_config_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package config +package common import ( "context" diff --git a/e2e/common/config/pipe_config_test.go b/e2e/common/config/pipe_config_test.go index 1011678f6..2ef8c7039 100644 --- a/e2e/common/config/pipe_config_test.go +++ b/e2e/common/config/pipe_config_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package config +package common import ( "context" diff --git a/e2e/common/languages/groovy_test.go b/e2e/common/languages/groovy_test.go index 7d60628f3..8855d4969 100644 --- a/e2e/common/languages/groovy_test.go +++ b/e2e/common/languages/groovy_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package languages +package common import ( "context" diff --git a/e2e/common/languages/java_test.go b/e2e/common/languages/java_test.go index a3d21ac4c..6f608d575 100644 --- a/e2e/common/languages/java_test.go +++ b/e2e/common/languages/java_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package languages +package common import ( "context" diff --git a/e2e/common/languages/js_test.go b/e2e/common/languages/js_test.go index cdf333be3..2813e0d8f 100644 --- a/e2e/common/languages/js_test.go +++ b/e2e/common/languages/js_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package languages +package common import ( "context" diff --git a/e2e/common/languages/kotlin_test.go b/e2e/common/languages/kotlin_test.go index f1a4fd168..c5c6f01af 100644 --- a/e2e/common/languages/kotlin_test.go +++ b/e2e/common/languages/kotlin_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package languages +package common import ( "context" diff --git a/e2e/common/languages/polyglot_test.go b/e2e/common/languages/polyglot_test.go index 8092e3dda..b01dc4017 100644 --- a/e2e/common/languages/polyglot_test.go +++ b/e2e/common/languages/polyglot_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package languages +package common import ( "context" diff --git a/e2e/common/languages/xml_test.go b/e2e/common/languages/xml_test.go index 23a8a7eb8..8219fc1c6 100644 --- a/e2e/common/languages/xml_test.go +++ b/e2e/common/languages/xml_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package languages +package common import ( "context" diff --git a/e2e/common/languages/yaml_test.go b/e2e/common/languages/yaml_test.go index 0eb028dcb..3c52ca8cf 100644 --- a/e2e/common/languages/yaml_test.go +++ b/e2e/common/languages/yaml_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package languages +package common import ( "context" diff --git a/e2e/common/misc/client_test.go b/e2e/common/misc/client_test.go index eba58aad4..5351d82a0 100644 --- a/e2e/common/misc/client_test.go +++ b/e2e/common/misc/client_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package misc +package common import ( "context" diff --git a/e2e/common/misc/cron_test.go b/e2e/common/misc/cron_test.go index 2496dc144..ebff1852a 100644 --- a/e2e/common/misc/cron_test.go +++ b/e2e/common/misc/cron_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package misc +package common import ( "context" diff --git a/e2e/common/misc/integration_fail_test.go b/e2e/common/misc/integration_fail_test.go index 23132ade6..c7e84e4fa 100644 --- a/e2e/common/misc/integration_fail_test.go +++ b/e2e/common/misc/integration_fail_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package misc +package common import ( "context" diff --git a/e2e/common/misc/integration_trait_update_test.go b/e2e/common/misc/integration_trait_update_test.go index 1a83a5e22..23f9d9746 100644 --- a/e2e/common/misc/integration_trait_update_test.go +++ b/e2e/common/misc/integration_trait_update_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package misc +package common import ( "context" diff --git a/e2e/common/misc/kamelet_test.go b/e2e/common/misc/kamelet_test.go index c7c4eff54..7dc1e2a20 100644 --- a/e2e/common/misc/kamelet_test.go +++ b/e2e/common/misc/kamelet_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package misc +package common import ( "context" diff --git a/e2e/common/misc/kamelet_update_test.go b/e2e/common/misc/kamelet_update_test.go index 2af100a2b..f9e45fc00 100644 --- a/e2e/common/misc/kamelet_update_test.go +++ b/e2e/common/misc/kamelet_update_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package misc +package common import ( "context" diff --git a/e2e/common/misc/maven_repository_test.go b/e2e/common/misc/maven_repository_test.go index c20acbc78..cffb9a162 100644 --- a/e2e/common/misc/maven_repository_test.go +++ b/e2e/common/misc/maven_repository_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package misc +package common import ( "context" diff --git a/e2e/common/misc/pipe_test.go b/e2e/common/misc/pipe_test.go index a955e841e..1093b9d6e 100644 --- a/e2e/common/misc/pipe_test.go +++ b/e2e/common/misc/pipe_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package misc +package common import ( "context" diff --git a/e2e/common/misc/rest_test.go b/e2e/common/misc/rest_test.go index 1e2577e56..b5e285884 100644 --- a/e2e/common/misc/rest_test.go +++ b/e2e/common/misc/rest_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package misc +package common import ( "context" diff --git a/e2e/common/misc/scale_integration_test.go b/e2e/common/misc/scale_integration_test.go index a72b1999e..4572e0ff1 100644 --- a/e2e/common/misc/scale_integration_test.go +++ b/e2e/common/misc/scale_integration_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package misc +package common import ( "context" diff --git a/e2e/common/misc/structured_logs_test.go b/e2e/common/misc/structured_logs_test.go index 5b8c46f60..9f879302b 100644 --- a/e2e/common/misc/structured_logs_test.go +++ b/e2e/common/misc/structured_logs_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package misc +package common import ( "context" diff --git a/e2e/common/runtimes/runtimes_test.go b/e2e/common/runtimes/runtimes_test.go index 77bb56070..a08550e9b 100644 --- a/e2e/common/runtimes/runtimes_test.go +++ b/e2e/common/runtimes/runtimes_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package runtimes +package common import ( "context" diff --git a/e2e/common/traits/affinity_test.go b/e2e/common/traits/affinity_test.go index fa9c8487f..f4dcafdc3 100644 --- a/e2e/common/traits/affinity_test.go +++ b/e2e/common/traits/affinity_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/builder_test.go b/e2e/common/traits/builder_test.go index a16bedfe7..02d96fb16 100644 --- a/e2e/common/traits/builder_test.go +++ b/e2e/common/traits/builder_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/camel_test.go b/e2e/common/traits/camel_test.go index 343ed312d..ed82d71ef 100644 --- a/e2e/common/traits/camel_test.go +++ b/e2e/common/traits/camel_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/container_test.go b/e2e/common/traits/container_test.go index f5c8a1dc0..74276d1b8 100644 --- a/e2e/common/traits/container_test.go +++ b/e2e/common/traits/container_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/deployment_test.go b/e2e/common/traits/deployment_test.go index fc66e5437..1e74e58fb 100644 --- a/e2e/common/traits/deployment_test.go +++ b/e2e/common/traits/deployment_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/error_handler_test.go b/e2e/common/traits/error_handler_test.go index 38bf530a6..d421a99e1 100644 --- a/e2e/common/traits/error_handler_test.go +++ b/e2e/common/traits/error_handler_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/errored_trait_test.go b/e2e/common/traits/errored_trait_test.go index 6be80ea0d..61036d771 100644 --- a/e2e/common/traits/errored_trait_test.go +++ b/e2e/common/traits/errored_trait_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/gc_test.go b/e2e/common/traits/gc_test.go index 6bf34550e..58163e5aa 100644 --- a/e2e/common/traits/gc_test.go +++ b/e2e/common/traits/gc_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go index 2a3f8d8b4..41dea83a4 100644 --- a/e2e/common/traits/health_test.go +++ b/e2e/common/traits/health_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/istio_test.go b/e2e/common/traits/istio_test.go index 6c04334aa..30ff98786 100644 --- a/e2e/common/traits/istio_test.go +++ b/e2e/common/traits/istio_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/jolokia_test.go b/e2e/common/traits/jolokia_test.go index 0f147a156..b1a1510c0 100644 --- a/e2e/common/traits/jolokia_test.go +++ b/e2e/common/traits/jolokia_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/jvm_test.go b/e2e/common/traits/jvm_test.go index a2c627e80..a6456c324 100644 --- a/e2e/common/traits/jvm_test.go +++ b/e2e/common/traits/jvm_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/kamelet_test.go b/e2e/common/traits/kamelet_test.go index ee97ec765..b5515a6c7 100644 --- a/e2e/common/traits/kamelet_test.go +++ b/e2e/common/traits/kamelet_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/master_test.go b/e2e/common/traits/master_test.go index cdda85126..b545eba1f 100644 --- a/e2e/common/traits/master_test.go +++ b/e2e/common/traits/master_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/openapi_test.go b/e2e/common/traits/openapi_test.go index 4822bca40..217738d60 100644 --- a/e2e/common/traits/openapi_test.go +++ b/e2e/common/traits/openapi_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/pdb_test.go b/e2e/common/traits/pdb_test.go index aa7bdb815..2e50d0eb4 100644 --- a/e2e/common/traits/pdb_test.go +++ b/e2e/common/traits/pdb_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/pod_test.go b/e2e/common/traits/pod_test.go index 0492266fe..1e3687cc6 100644 --- a/e2e/common/traits/pod_test.go +++ b/e2e/common/traits/pod_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/prometheus_test.go b/e2e/common/traits/prometheus_test.go index 418296e50..939ee136e 100644 --- a/e2e/common/traits/prometheus_test.go +++ b/e2e/common/traits/prometheus_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/pull_secret_test.go b/e2e/common/traits/pull_secret_test.go index 4910cf150..e0d7bead8 100644 --- a/e2e/common/traits/pull_secret_test.go +++ b/e2e/common/traits/pull_secret_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/route_test.go b/e2e/common/traits/route_test.go index 1573b7c94..b39d01831 100644 --- a/e2e/common/traits/route_test.go +++ b/e2e/common/traits/route_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "bytes" diff --git a/e2e/common/traits/service_binding_test.go b/e2e/common/traits/service_binding_test.go index c5bc27845..84086f5ad 100644 --- a/e2e/common/traits/service_binding_test.go +++ b/e2e/common/traits/service_binding_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/service_test.go b/e2e/common/traits/service_test.go index 9fda55c3d..0aadb2fdd 100644 --- a/e2e/common/traits/service_test.go +++ b/e2e/common/traits/service_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/e2e/common/traits/toleration_test.go b/e2e/common/traits/toleration_test.go index 92bed0e8b..000242c14 100644 --- a/e2e/common/traits/toleration_test.go +++ b/e2e/common/traits/toleration_test.go @@ -20,7 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package traits +package common import ( "context" diff --git a/script/Makefile b/script/Makefile index 322edaf08..91e37d4db 100644 --- a/script/Makefile +++ b/script/Makefile @@ -278,7 +278,7 @@ setup-knative: # test-common: FAILED=0; STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)"; \ - go test -p $(TEST_COMMON_PARALLEL_COUNT) -timeout 90m -v ./e2e/common/... -tags=integration $(GOTESTFMT) || ((FAILED++)); \ + go test -p $(TEST_COMMON_PARALLEL_COUNT) -timeout 90m -v ./e2e/common/... --parallel $(TEST_COMMON_PARALLEL_COUNT) -tags=integration $(GOTESTFMT) || ((FAILED++)); \ exit $${FAILED} # @@ -289,6 +289,7 @@ test-smoke: go test -p $(TEST_COMMON_PARALLEL_COUNT) -timeout 30m -v \ ./e2e/common/languages \ ./e2e/common/traits \ + --parallel $(TEST_COMMON_PARALLEL_COUNT) \ -tags=integration $(GOTESTFMT) || ((FAILED++)); \ exit $${FAILED} @@ -297,7 +298,7 @@ test-smoke: # test-advanced: FAILED=0; STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)"; \ - go test -p=$(TEST_ADVANCED_PARALLEL_COUNT) -timeout 90m -v ./e2e/advanced -tags=integration $(GOTESTFMT) || ((FAILED++)); \ + go test -p=$(TEST_ADVANCED_PARALLEL_COUNT) -timeout 90m -v ./e2e/advanced --parallel $(TEST_ADVANCED_PARALLEL_COUNT) -tags=integration $(GOTESTFMT) || ((FAILED++)); \ exit $${FAILED} #
