diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.10-upgrade-from-stable-4.9.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.10-upgrade-from-stable-4.9.yaml index 9ff0d534926f..c492d7afb0e4 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.10-upgrade-from-stable-4.9.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.10-upgrade-from-stable-4.9.yaml @@ -74,6 +74,7 @@ tests: steps: cluster_profile: gcp-openshift-gce-devel-ci-2 env: + STALLD_ENABLED: "false" TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-gcp-ovn-rt - as: e2e-azure-ovn-upgrade diff --git a/ci-operator/step-registry/optional-operators/configure-realtime-tuned-profile/optional-operators-configure-realtime-tuned-profile-commands.sh b/ci-operator/step-registry/optional-operators/configure-realtime-tuned-profile/optional-operators-configure-realtime-tuned-profile-commands.sh index f940bcde0464..06354d798265 100755 --- a/ci-operator/step-registry/optional-operators/configure-realtime-tuned-profile/optional-operators-configure-realtime-tuned-profile-commands.sh +++ b/ci-operator/step-registry/optional-operators/configure-realtime-tuned-profile/optional-operators-configure-realtime-tuned-profile-commands.sh @@ -7,6 +7,8 @@ set -o pipefail node_role=${APPLY_NODE_ROLE:=worker} max_cpu=8 isolated_cpu=${COMPUTE_NODE_ISOLATED_CPU:-4} +sched_rt_runtime_us=-1 +stalld_service="service.stalld=start,enable" gcp_pattern="[n|c|m|a]{1}[1-9]{1}d?-(standard|highcpu|highmem|highgpu){1}-([0-9]+)" # Currently RT is only supported on GCP @@ -24,6 +26,13 @@ if [[ "$isolated_cpu" == "$max_cpu" ]]; then echo "max and isolated cpu are equal, setting isolated CPU to $isolated_cpu" fi +if [ ${STALLD_ENABLED:="true"} != "true" ] +then + echo "disabling stalld and setting default realtime timeout" + sched_rt_runtime_us=950000 + stalld_service="" +fi + echo "Creating new realtime tuned profile on cluster" oc create -f - <