Skip to content

Commit

Permalink
Revert "Disable cgroups tests on OCP 4.14+ (#2210)" (#2253)
Browse files Browse the repository at this point in the history
This reverts commit 400fa91.

The necessary changes for the CGroups test were merged as part of openshift-knative/serving#428
  • Loading branch information
mgencur authored Aug 29, 2023
1 parent 30f70bc commit e85c447
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions test/serving.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit e85c447

Please sign in to comment.