Test with only Serving

openshift-knative · Aug 13, 2024 · b0cca44 · b0cca44
1 parent a9ed1ed
commit b0cca44
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -152,8 +152,8 @@ install-for-mesh-e2e:
 	MESH=true SCALE_UP=6 INSTALL_SERVING=true INSTALL_EVENTING=true INSTALL_KAFKA=true TRACING_BACKEND=zipkin TRACING_NAMESPACE=knative-eventing ENABLE_TRACING=true ./hack/install.sh
 
 mesh-e2e: install-for-mesh-e2e
-	MESH=true TEST_KNATIVE_KAFKA=true ./test/e2e-tests.sh
-	MESH=true TEST_KNATIVE_KAFKA=false TEST_KNATIVE_SERVING=true TEST_KNATIVE_EVENTING=true TEST_KNATIVE_KAFKA_BROKER=true TEST_KNATIVE_UPGRADE=false ./test/upstream-e2e-tests.sh
+	MESH=true TEST_KNATIVE_KAFKA=false ./test/e2e-tests.sh
+	MESH=true TEST_KNATIVE_KAFKA=false TEST_KNATIVE_SERVING=true TEST_KNATIVE_EVENTING=false TEST_KNATIVE_KAFKA_BROKER=false TEST_KNATIVE_UPGRADE=false ./test/upstream-e2e-tests.sh
 
 test-upstream-e2e-mesh: mesh-e2e
 
@@ -195,7 +195,7 @@ mesh-upgrade:
 	TRACING_BACKEND=zipkin ./hack/tracing.sh
 	UNINSTALL_STRIMZI=false ./hack/strimzi.sh
 	MESH=true INSTALL_PREVIOUS_VERSION=true INSTALL_KAFKA=true TRACING_BACKEND=zipkin ENABLE_TRACING=true SCALE_UP=5 ./hack/install.sh
-	MESH=true TEST_KNATIVE_KAFKA=true TEST_KNATIVE_E2E=false TEST_KNATIVE_UPGRADE=true ./test/upstream-e2e-tests.sh
+	MESH=true TEST_KNATIVE_KAFKA=false TEST_KNATIVE_E2E=false TEST_KNATIVE_UPGRADE=true ./test/upstream-e2e-tests.sh
 
 test-upgrade-with-mesh: mesh-upgrade
 

diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
@@ -34,8 +34,8 @@ fi
 
 # Run Knative Serving & Eventing downstream E2E tests.
 downstream_serving_e2e_tests
-downstream_eventing_e2e_tests
-downstream_eventing_e2e_rekt_tests
+#downstream_eventing_e2e_tests
+#downstream_eventing_e2e_rekt_tests
 downstream_monitoring_e2e_tests
 if [[ $TEST_KNATIVE_KAFKA == true ]]; then
   downstream_knative_kafka_e2e_tests

diff --git a/test/upstream-e2e-tests.sh b/test/upstream-e2e-tests.sh
@@ -25,9 +25,9 @@ run_testselect
 # Run upgrade tests
 if [[ $TEST_KNATIVE_UPGRADE == true ]]; then
   # Set KafkaChannel as default for upgrade tests.
-  if [[ $TEST_KNATIVE_KAFKA == "true" ]]; then
-    ensure_kafka_channel_default
-  fi
+#  if [[ $TEST_KNATIVE_KAFKA == "true" ]]; then
+#    ensure_kafka_channel_default
+#  fi
   run_rolling_upgrade_tests
 fi
 
@@ -36,15 +36,15 @@ if [[ $TEST_KNATIVE_E2E == true ]]; then
   # TODO: Remove this when upstream tests can use in-cluster config.
   # See https://github.com/knative/eventing/issues/5996 (the same issue affects Eventing Kafka)
   ensure_kubeconfig
-  if [[ $TEST_KNATIVE_KAFKA_BROKER == true ]]; then
-    upstream_knative_eventing_kafka_broker_e2e
-  fi
+#  if [[ $TEST_KNATIVE_KAFKA_BROKER == true ]]; then
+#    upstream_knative_eventing_kafka_broker_e2e
+#  fi
   if [[ $TEST_KNATIVE_SERVING == true ]]; then
     upstream_knative_serving_e2e_and_conformance_tests
   fi
-  if [[ $TEST_KNATIVE_EVENTING == true ]]; then
-    upstream_knative_eventing_e2e
-  fi
+#  if [[ $TEST_KNATIVE_EVENTING == true ]]; then
+#    upstream_knative_eventing_e2e
+#  fi
 fi
 
 [ -n "$OPENSHIFT_CI" ] && check_serverless_alerts