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/12/05 15:39:55 UTC
(camel-k) 03/04: chore(e2e): Refactor resources number const
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-2.1.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 6c3faaa0bddbfed5ef42ae26887c8d8b4ac42944
Author: Gaelle Fournier <ga...@gmail.com>
AuthorDate: Fri Nov 24 11:35:02 2023 +0100
chore(e2e): Refactor resources number const
---
e2e/install/kustomize/setup_test.go | 21 ---------------------
e2e/support/test_support.go | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/e2e/install/kustomize/setup_test.go b/e2e/install/kustomize/setup_test.go
index 5b1058630..429f516e7 100644
--- a/e2e/install/kustomize/setup_test.go
+++ b/e2e/install/kustomize/setup_test.go
@@ -32,27 +32,6 @@ import (
. "github.com/onsi/gomega"
)
-const (
-
- // camel-k-operator, camel-k-operator-events,
- // camel-k-operator-knative, camel-k-operator-leases,
- // camel-k-operator-podmonitors, camel-k-operator-strimzi,
- // camel-k-operator-keda
- ExpectedKubePromoteRoles = 7
-
- // camel-k-edit
- // camel-k-operator-custom-resource-definitions
- // camel-k-operator-bind-addressable-resolver
- // camel-k-operator-local-registry
- ExpectedKubeClusterRoles = 4
-
- // camel-k-operator-openshift
- ExpectedOSPromoteRoles = 1
-
- // camel-k-operator-console-openshift
- ExpectedOSClusterRoles = 1
-)
-
func TestSetupKustomizeBasic(t *testing.T) {
RegisterTestingT(t)
makeDir := testutil.MakeTempCopyDir(t, "../../../install")
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 61aa98a53..d2648b257 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -101,6 +101,24 @@ const ciPID = "/tmp/ci-k8s-pid"
// v1alpha1.Kamelet, v1alpha1.KameletBinding
const ExpectedCRDs = 8
+// camel-k-operator, camel-k-operator-events,
+// camel-k-operator-knative, camel-k-operator-leases,
+// camel-k-operator-podmonitors, camel-k-operator-strimzi,
+// camel-k-operator-keda
+const ExpectedKubePromoteRoles = 7
+
+// camel-k-edit
+// camel-k-operator-custom-resource-definitions
+// camel-k-operator-bind-addressable-resolver
+// camel-k-operator-local-registry
+const ExpectedKubeClusterRoles = 4
+
+// camel-k-operator-openshift
+const ExpectedOSPromoteRoles = 1
+
+// camel-k-operator-console-openshift
+const ExpectedOSClusterRoles = 1
+
var TestTimeoutShort = 1 * time.Minute
var TestTimeoutMedium = 5 * time.Minute
var TestTimeoutLong = 15 * time.Minute