This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 7df1a13dc911687ebcd1c9aae2606d28a3c7c1cd Author: Jan Bouska <[email protected]> AuthorDate: Fri Sep 23 11:01:23 2022 +0200 [TEST] Extract shared functions --- e2e/namespace/native/native_test.go | 14 --------- e2e/namespace/native/native_test_support.go | 44 +++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/e2e/namespace/native/native_test.go b/e2e/namespace/native/native_test.go index 3c6533289..74e2b8375 100644 --- a/e2e/namespace/native/native_test.go +++ b/e2e/namespace/native/native_test.go @@ -24,7 +24,6 @@ package native import ( "os" - "strings" "testing" . "github.com/onsi/gomega" @@ -35,11 +34,6 @@ import ( v1 "github.com/apache/camel-k/pkg/apis/camel/v1" ) -var ( - withFastJarLayout = KitWithLabels(map[string]string{v1.IntegrationKitLayoutLabel: v1.IntegrationKitLayoutFastJar}) - withNativeLayout = KitWithLabels(map[string]string{v1.IntegrationKitLayoutLabel: v1.IntegrationKitLayoutNative}) -) - func TestNativeIntegrations(t *testing.T) { if os.Getenv("CAMEL_K_CLUSTER_OCP3") == "true" { t.Skip("INFO: Skipping test as known to never pass on OCP3") @@ -114,11 +108,3 @@ func TestNativeIntegrations(t *testing.T) { Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) }) } - -func getContainerCommand() func(pod *corev1.Pod) string { - return func(pod *corev1.Pod) string { - cmd := strings.Join(pod.Spec.Containers[0].Command, " ") - cmd = cmd + strings.Join(pod.Spec.Containers[0].Args, " ") - return cmd - } -} diff --git a/e2e/namespace/native/native_test_support.go b/e2e/namespace/native/native_test_support.go new file mode 100644 index 000000000..acd37558b --- /dev/null +++ b/e2e/namespace/native/native_test_support.go @@ -0,0 +1,44 @@ +//go:build integration +// +build integration + +// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "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 native + +import ( + corev1 "k8s.io/api/core/v1" + "strings" + + . "github.com/apache/camel-k/e2e/support" + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" +) + +var ( + withFastJarLayout = KitWithLabels(map[string]string{v1.IntegrationKitLayoutLabel: v1.IntegrationKitLayoutFastJar}) + withNativeLayout = KitWithLabels(map[string]string{v1.IntegrationKitLayoutLabel: v1.IntegrationKitLayoutNative}) +) + +func getContainerCommand() func(pod *corev1.Pod) string { + return func(pod *corev1.Pod) string { + cmd := strings.Join(pod.Spec.Containers[0].Command, " ") + cmd = cmd + strings.Join(pod.Spec.Containers[0].Args, " ") + return cmd + } +}
