This is an automated email from the ASF dual-hosted git repository.
tsato 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 db1be0dbd chore(e2e): clean up OCP3 guards
db1be0dbd is described below
commit db1be0dbd1b76ec924e7bec9a2eb7727d8b7f25e
Author: Tadayoshi Sato <sato.tadayo...@gmail.com>
AuthorDate: Thu Oct 27 16:16:07 2022 +0900
chore(e2e): clean up OCP3 guards
---
e2e/global/builder/build_test.go | 5 -----
e2e/namespace/install/kustomize/operator_test.go | 22 ----------------------
e2e/namespace/install/kustomize/setup_test.go | 8 --------
e2e/namespace/native/native_test.go | 6 ------
4 files changed, 41 deletions(-)
diff --git a/e2e/global/builder/build_test.go b/e2e/global/builder/build_test.go
index b69265d84..a92564a5e 100644
--- a/e2e/global/builder/build_test.go
+++ b/e2e/global/builder/build_test.go
@@ -57,11 +57,6 @@ func TestKitKnativeFullBuild(t *testing.T) {
}
func TestKitTimerToLogFullNativeBuild(t *testing.T) {
- if os.Getenv("CAMEL_K_CLUSTER_OCP3") == "true" {
- t.Skip("INFO: Skipping test as known to never pass on OCP3")
- return
- }
-
doKitFullBuild(t, "timer-to-log", "4Gi", "15m0s", TestTimeoutVeryLong,
kitOptions{
dependencies: []string{
"camel:timer", "camel:log",
diff --git a/e2e/namespace/install/kustomize/operator_test.go
b/e2e/namespace/install/kustomize/operator_test.go
index d9cf17c2b..a6a9f8738 100644
--- a/e2e/namespace/install/kustomize/operator_test.go
+++ b/e2e/namespace/install/kustomize/operator_test.go
@@ -31,21 +31,7 @@ import (
. "github.com/onsi/gomega"
)
-func TestOcp3CrdError(t *testing.T) {
- if os.Getenv("CAMEL_K_CLUSTER_OCP3") != "true" {
- t.Skip("INFO: Skipping test as only applicable to OCP3")
- }
-
- WithNewTestNamespace(t, func(ns string) {
- ExecMakeError(t, Make("setup-cluster",
fmt.Sprintf("NAMESPACE=%s", ns)))
- })
-}
-
func TestBasicOperator(t *testing.T) {
- if os.Getenv("CAMEL_K_CLUSTER_OCP3") == "true" {
- t.Skip("INFO: Skipping test as not supported on OCP3")
- }
-
os.Setenv("MAKE_DIR", "../../../../install")
// Ensure no CRDs are already installed
@@ -64,10 +50,6 @@ func TestBasicOperator(t *testing.T) {
}
func TestAlternativeImageOperator(t *testing.T) {
- if os.Getenv("CAMEL_K_CLUSTER_OCP3") == "true" {
- t.Skip("INFO: Skipping test as not supported on OCP3")
- }
-
os.Setenv("MAKE_DIR", "../../../../install")
// Ensure no CRDs are already installed
@@ -90,10 +72,6 @@ func TestAlternativeImageOperator(t *testing.T) {
}
func TestGlobalOperator(t *testing.T) {
- if os.Getenv("CAMEL_K_CLUSTER_OCP3") == "true" {
- t.Skip("INFO: Skipping test as not supported on OCP3")
- }
-
os.Setenv("MAKE_DIR", "../../../../install")
// Ensure no CRDs are already installed
diff --git a/e2e/namespace/install/kustomize/setup_test.go
b/e2e/namespace/install/kustomize/setup_test.go
index 93923fcfb..2ace67ab3 100644
--- a/e2e/namespace/install/kustomize/setup_test.go
+++ b/e2e/namespace/install/kustomize/setup_test.go
@@ -32,10 +32,6 @@ import (
)
func TestBasicSetup(t *testing.T) {
- if os.Getenv("CAMEL_K_CLUSTER_OCP3") == "true" {
- t.Skip("INFO: Skipping test as not supported on OCP3")
- }
-
os.Setenv("MAKE_DIR", "../../../../install")
// Ensure no CRDs are already installed
@@ -65,10 +61,6 @@ func TestBasicSetup(t *testing.T) {
}
func TestGlobalSetup(t *testing.T) {
- if os.Getenv("CAMEL_K_CLUSTER_OCP3") == "true" {
- t.Skip("INFO: Skipping test as not supported on OCP3")
- }
-
os.Setenv("MAKE_DIR", "../../../../install")
// Ensure no CRDs are already installed
diff --git a/e2e/namespace/native/native_test.go
b/e2e/namespace/native/native_test.go
index 137524809..eb03d509c 100644
--- a/e2e/namespace/native/native_test.go
+++ b/e2e/namespace/native/native_test.go
@@ -23,7 +23,6 @@ limitations under the License.
package native
import (
- "os"
"testing"
. "github.com/onsi/gomega"
@@ -35,11 +34,6 @@ import (
)
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")
- return
- }
-
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-quarkus-native"
Expect(KamelInstallWithID(operatorID, ns,
