Merge branch 'main' into bugfix/ocp-414-link

test/serving.bash

@@ -73,14 +73,6 @@ function upstream_knative_serving_e2e_and_conformance_tests {
     sed -ie '47,51d' ./test/conformance/runtime/protocol_test.go
   fi
 
-  ocp_version=$(oc get clusterversion version -o jsonpath='{.status.desired.version}')
-
-  # Disable cgroups test on OCP 4.14+ until it supports cgroups v2.
-  # https://issues.redhat.com/browse/SRVKS-1111
-  if versions.ge "$(versions.major_minor "$ocp_version")" 4.14; then
-    rm ./test/conformance/runtime/cgroup_test.go
-  fi
-
   local parallel=16
 
   if [[ $(oc get infrastructure cluster -ojsonpath='{.status.platform}') = VSphere ]]; then
@@ -156,6 +148,8 @@ function upstream_knative_serving_e2e_and_conformance_tests {
   oc -n "$SERVING_NAMESPACE" patch hpa activator --patch \
     '{"spec": {"maxReplicas": '"${max_replicas}"', "minReplicas": '"${min_replicas}"'}}'
 
+  ocp_version=$(oc get clusterversion version -o jsonpath='{.status.desired.version}')
+
   # Feature is tested on 4.11+ as this is the version we start enabling it by default.
   if versions.ge "$(versions.major_minor "$ocp_version")" "4.11"; then
       # Enable secure pod defaults for the following tests.

test/servinge2e/kourier/service_to_service_test.go

@@ -18,10 +18,6 @@ import (
 // services from within the cluster.
 func TestServiceToServiceCalls(t *testing.T) {
 
-	caCtx := test.SetupClusterAdmin(t)
-	test.CleanupOnInterrupt(t, func() { test.CleanupAll(t, caCtx) })
-	defer test.CleanupAll(t, caCtx)
-
 	tests := []testCase{{
 		// Requests go via gateway -> activator -> pod.
 		name: "service-call-via-activator",
@@ -58,7 +54,11 @@ func TestServiceToServiceCalls(t *testing.T) {
 	for _, scenario := range tests {
 		scenario := scenario
 		t.Run(scenario.name, func(t *testing.T) {
-			testServiceToService(t, caCtx, test.Namespace, scenario)
+			// Create a new context to prevent calling ctx.T.Fatal on parent T.
+			ctx := test.SetupClusterAdmin(t)
+			test.CleanupOnInterrupt(t, func() { test.CleanupAll(t, ctx) })
+			defer test.CleanupAll(t, ctx)
+			testServiceToService(t, ctx, test.Namespace, scenario)
 		})
 	}
 }