From 0f515ef9e94ad0a6e7e8b66ed6f5e1c9526fa4bb Mon Sep 17 00:00:00 2001 From: Martin Sivak Date: Mon, 4 Mar 2024 14:27:18 +0100 Subject: [PATCH] Sync rendering tests --- .../extra-mcp/openshift-bootstrap-master_tuned.yaml | 7 ++++++- .../extra-mcp/openshift-bootstrap-worker_tuned.yaml | 7 ++++++- .../no-mcp/openshift-bootstrap-master_tuned.yaml | 7 ++++++- .../no-mcp/openshift-bootstrap-worker_tuned.yaml | 7 ++++++- .../default/cpuFrequency/manual_tuned.yaml | 9 +++++++-- .../render-expected-output/default/manual_tuned.yaml | 7 ++++++- .../render-expected-output/no-ref/manual_tuned.yaml | 7 ++++++- 7 files changed, 43 insertions(+), 8 deletions(-) diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_tuned.yaml index 5c4b734a81..4be64b8cf1 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_tuned.yaml @@ -51,7 +51,12 @@ spec: tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded} intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores} tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n - \n\n\n\n\ncmdline_pstate=+intel_pstate=disable\n\n\n[rtentsk]\n\n\n" + \n\n\n\n\ncmdline_pstate=+intel_pstate=disable\n\n\n# In case a smartpqi device + is present, make sure the interrupt affinity\n# can be managed by userspace + services. This driver does not obey\n# the isolcpus=managed_irq hint and is + causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\n<<<<<<< + HEAD\n[bootloader_smartpqi]\ndevices_udev_regex==DRIVER=smartpqi\ncmdline_smartpqi=+smartpqi.disable_managed_interrupts=1\n=======\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n>>>>>>> + 6616ca50 (f tuned)\n\n[rtentsk]\n\n\n" name: openshift-node-performance-openshift-bootstrap-master - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_tuned.yaml index f9544ded1c..3f3d737d2f 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_tuned.yaml @@ -51,7 +51,12 @@ spec: tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded} intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores} tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n - \n\n\n\n\ncmdline_pstate=+intel_pstate=disable\n\n\n[rtentsk]\n\n\n" + \n\n\n\n\ncmdline_pstate=+intel_pstate=disable\n\n\n# In case a smartpqi device + is present, make sure the interrupt affinity\n# can be managed by userspace + services. This driver does not obey\n# the isolcpus=managed_irq hint and is + causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\n<<<<<<< + HEAD\n[bootloader_smartpqi]\ndevices_udev_regex==DRIVER=smartpqi\ncmdline_smartpqi=+smartpqi.disable_managed_interrupts=1\n=======\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n>>>>>>> + 6616ca50 (f tuned)\n\n[rtentsk]\n\n\n" name: openshift-node-performance-openshift-bootstrap-worker - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_tuned.yaml index 5c4b734a81..4be64b8cf1 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_tuned.yaml @@ -51,7 +51,12 @@ spec: tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded} intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores} tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n - \n\n\n\n\ncmdline_pstate=+intel_pstate=disable\n\n\n[rtentsk]\n\n\n" + \n\n\n\n\ncmdline_pstate=+intel_pstate=disable\n\n\n# In case a smartpqi device + is present, make sure the interrupt affinity\n# can be managed by userspace + services. This driver does not obey\n# the isolcpus=managed_irq hint and is + causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\n<<<<<<< + HEAD\n[bootloader_smartpqi]\ndevices_udev_regex==DRIVER=smartpqi\ncmdline_smartpqi=+smartpqi.disable_managed_interrupts=1\n=======\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n>>>>>>> + 6616ca50 (f tuned)\n\n[rtentsk]\n\n\n" name: openshift-node-performance-openshift-bootstrap-master - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_tuned.yaml index f9544ded1c..3f3d737d2f 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_tuned.yaml @@ -51,7 +51,12 @@ spec: tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded} intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores} tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n - \n\n\n\n\ncmdline_pstate=+intel_pstate=disable\n\n\n[rtentsk]\n\n\n" + \n\n\n\n\ncmdline_pstate=+intel_pstate=disable\n\n\n# In case a smartpqi device + is present, make sure the interrupt affinity\n# can be managed by userspace + services. This driver does not obey\n# the isolcpus=managed_irq hint and is + causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\n<<<<<<< + HEAD\n[bootloader_smartpqi]\ndevices_udev_regex==DRIVER=smartpqi\ncmdline_smartpqi=+smartpqi.disable_managed_interrupts=1\n=======\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n>>>>>>> + 6616ca50 (f tuned)\n\n[rtentsk]\n\n\n" name: openshift-node-performance-openshift-bootstrap-worker - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_tuned.yaml index f8e628ad4c..8d10d2e46d 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/cpuFrequency/manual_tuned.yaml @@ -49,8 +49,13 @@ spec: tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded} intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores} tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+ - default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n\ncmdline_pstate=+intel_pstate=active\n\n\n[rtentsk]\n\n\n[sysfs]\n# - sets provided frequencies to isolated and reserved cpus\n\n/sys/devices/system/cpu/cpufreq/policy2/scaling_max_freq=2500000\n/sys/devices/system/cpu/cpufreq/policy3/scaling_max_freq=2500000\n/sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq=2800000\n/sys/devices/system/cpu/cpufreq/policy1/scaling_max_freq=2800000\n" + default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n\ncmdline_pstate=+intel_pstate=active\n\n\n# + In case a smartpqi device is present, make sure the interrupt affinity\n# can + be managed by userspace services. This driver does not obey\n# the isolcpus=managed_irq + hint and is causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\n<<<<<<< + HEAD\n[bootloader_smartpqi]\ndevices_udev_regex==DRIVER=smartpqi\ncmdline_smartpqi=+smartpqi.disable_managed_interrupts=1\n=======\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n>>>>>>> + 6616ca50 (f tuned)\n\n[rtentsk]\n\n\n[sysfs]\n# sets provided frequencies to + isolated and reserved cpus\n\n/sys/devices/system/cpu/cpufreq/policy2/scaling_max_freq=2500000\n/sys/devices/system/cpu/cpufreq/policy3/scaling_max_freq=2500000\n/sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq=2800000\n/sys/devices/system/cpu/cpufreq/policy1/scaling_max_freq=2800000\n" name: openshift-node-performance-manual - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml index b8923988f1..ef6bc9ce60 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_tuned.yaml @@ -51,7 +51,12 @@ spec: tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded} intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores} tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+ - default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n\ncmdline_pstate=+intel_pstate=disable\n\n\n[rtentsk]\n\n\n" + default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n\ncmdline_pstate=+intel_pstate=disable\n\n\n# + In case a smartpqi device is present, make sure the interrupt affinity\n# can + be managed by userspace services. This driver does not obey\n# the isolcpus=managed_irq + hint and is causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\n<<<<<<< + HEAD\n[bootloader_smartpqi]\ndevices_udev_regex==DRIVER=smartpqi\ncmdline_smartpqi=+smartpqi.disable_managed_interrupts=1\n=======\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n>>>>>>> + 6616ca50 (f tuned)\n\n[rtentsk]\n\n\n" name: openshift-node-performance-manual - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_tuned.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_tuned.yaml index d2586e6a7f..027073a367 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_tuned.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_tuned.yaml @@ -49,7 +49,12 @@ spec: tuned.non_isolcpus=${not_isolated_cpumask} systemd.cpu_affinity=${not_isolated_cores_expanded} intel_iommu=on iommu=pt\n\n\ncmdline_isolation=+isolcpus=managed_irq,${isolated_cores}\n\n\n\ncmdline_realtime=+nohz_full=${isolated_cores} tsc=reliable nosoftlockup nmi_watchdog=0 mce=off skew_tick=1 rcutree.kthread_prio=11\n\n\n\n\n\n\n\ncmdline_hugepages=+ - default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n\ncmdline_pstate=+intel_pstate=disable\n\n\n[rtentsk]\n\n\n" + default_hugepagesz=1G hugepagesz=2M hugepages=128 \n\n\n\n\ncmdline_pstate=+intel_pstate=disable\n\n\n# + In case a smartpqi device is present, make sure the interrupt affinity\n# can + be managed by userspace services. This driver does not obey\n# the isolcpus=managed_irq + hint and is causing interference.\n# See: https://issues.redhat.com/browse/OCPBUGS-25860\n<<<<<<< + HEAD\n[bootloader_smartpqi]\ndevices_udev_regex==DRIVER=smartpqi\ncmdline_smartpqi=+smartpqi.disable_managed_interrupts=1\n=======\ncmdline_smartpqi=+${f:regex_search_ternary:${f:exec:/usr/sbin/lsmod}:\\bsmartpqi\\b:smartpqi.disable_managed_interrupts=1:}\n>>>>>>> + 6616ca50 (f tuned)\n\n[rtentsk]\n\n\n" name: openshift-node-performance-manual - data: "[main]\nsummary=Real time profile to override unsupported settings\n\n[sysctl]\n#Real time kernel doesn't support the following kernel parameters.\n#The openshift-node-performance