From 169510c4c235285769c9ffdbc30b3046cdb385fc Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Tue, 2 Dec 2025 12:06:11 +0100 Subject: [PATCH 1/9] add profile and uncore-cache Test Suites to release bootc scenarios --- test/scenarios-bootc/releases/el96-lrel@low-latency.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/scenarios-bootc/releases/el96-lrel@low-latency.sh b/test/scenarios-bootc/releases/el96-lrel@low-latency.sh index 575e81e30b..ade84049a1 100644 --- a/test/scenarios-bootc/releases/el96-lrel@low-latency.sh +++ b/test/scenarios-bootc/releases/el96-lrel@low-latency.sh @@ -44,6 +44,8 @@ scenario_run_tests() { run_tests host1 \ --exitonfailure \ + suites/tuned/profile.robot \ suites/tuned/microshift-tuned.robot \ - suites/tuned/workload-partitioning.robot + suites/tuned/workload-partitioning.robot \ + suites/tuned/uncore-cache.robot } From 503da07fadbf8ef9bd56d0e636a7ae4160c02f46 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 3 Dec 2025 11:47:04 +0100 Subject: [PATCH 2/9] add support for bootc deployments --- test/suites/tuned/profile.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/suites/tuned/profile.robot b/test/suites/tuned/profile.robot index 81d6244fe9..5795d65560 100644 --- a/test/suites/tuned/profile.robot +++ b/test/suites/tuned/profile.robot @@ -26,7 +26,7 @@ X86 64 Should Run RT Kernel ${arch}= Command Should Work uname -m IF "${arch}" == "x86_64" - ${kernel}= Command Should Work sudo grubby --default-kernel + ${kernel}= Command Should Work uname -r Should End With ${kernel} +rt END From a60936e6ca6ea2d31b9f062171d7b067055c4f9f Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 3 Dec 2025 15:02:46 +0100 Subject: [PATCH 3/9] add kernel-rt RPM to lrel tuned bootc containerfile --- ...el96-bootc-brew-zstream-with-optional-tuned.containerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile index c9ad4b277d..274be37b25 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile @@ -4,7 +4,10 @@ FROM localhost/rhel96-bootc-brew-zstream-with-optional:latest # Install low-latency packages RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_Y0_RELEASE_VERSION"}} && \ - dnf clean all +# {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +dnf install -y kernel-rt && \ +# {{- end }} +dnf clean all # Enable microshift-tuned service RUN systemctl enable microshift-tuned From e8aec78d153af4333983d205a7b126a5d18aed46 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 3 Dec 2025 15:05:32 +0100 Subject: [PATCH 4/9] temp AWS S3 bucket for testing --- test/bin/manage_build_cache.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/bin/manage_build_cache.sh b/test/bin/manage_build_cache.sh index eeb88378ac..fe377a0401 100755 --- a/test/bin/manage_build_cache.sh +++ b/test/bin/manage_build_cache.sh @@ -8,6 +8,7 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source "${SCRIPTDIR}/common.sh" AWS_BUCKET_NAME="${AWS_BUCKET_NAME:-microshift-build-cache}" +AWS_BUCKET_NAME="microshift-build-pr5850-cache-us-west-2" BCH_SUBDIR= TAG_SUBDIR= From 27029f6cb22d3b01df8067aa524c9bc4ace713e9 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Tue, 9 Dec 2025 15:21:49 +0100 Subject: [PATCH 5/9] add it for ec and rc images --- .../rhel96-bootc-brew-ec-with-optional-tuned.containerfile | 7 +++++-- .../rhel96-bootc-brew-rc-with-optional-tuned.containerfile | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile index a952476851..dfb9203054 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile @@ -3,8 +3,11 @@ FROM localhost/rhel96-bootc-brew-ec-with-optional:latest # Install low-latency packages -RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_EC_RELEASE_VERSION"}} && \ - dnf clean all +RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_Y0_RELEASE_VERSION"}} && \ +# {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +dnf install -y kernel-rt && \ +# {{- end }} +dnf clean all # Enable microshift-tuned service RUN systemctl enable microshift-tuned diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile index 71543a0a71..632467b75a 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile @@ -3,8 +3,11 @@ FROM localhost/rhel96-bootc-brew-rc-with-optional:latest # Install low-latency packages -RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_RC_RELEASE_VERSION"}} && \ - dnf clean all +RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_Y0_RELEASE_VERSION"}} && \ +# {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +dnf install -y kernel-rt && \ +# {{- end }} +dnf clean all # Enable microshift-tuned service RUN systemctl enable microshift-tuned From 79c65a7f584590c20efd49e7f1bfd21cb1d93106 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Tue, 9 Dec 2025 16:56:51 +0100 Subject: [PATCH 6/9] fix log message --- test/suites/tuned/uncore-cache.robot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/suites/tuned/uncore-cache.robot b/test/suites/tuned/uncore-cache.robot index 7f23269988..d94206516e 100644 --- a/test/suites/tuned/uncore-cache.robot +++ b/test/suites/tuned/uncore-cache.robot @@ -77,10 +77,10 @@ Cleanup CPU State Remove Files ${KUBELET_CPU_STATE_FILE} Check FeatureGates Is Enabled - [Documentation] Skip suite if CoreDNS hosts feature is not available + [Documentation] Skip suite if FeatureGates feature is not available ${config}= Show Config default TRY VAR ${featuregates}= ${config}[apiServer][featureGates] EXCEPT - Skip CoreDNS hosts feature not available in this MicroShift version + Skip FeatureGates feature not available in this MicroShift version END From 445d620376493e56c3b0a3eaf0beba4cc16efccb Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 10 Dec 2025 00:01:22 +0100 Subject: [PATCH 7/9] fix --- .../rhel96-bootc-brew-ec-with-optional-tuned.containerfile | 2 +- .../rhel96-bootc-brew-rc-with-optional-tuned.containerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile index dfb9203054..a433fcd50e 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel96-bootc-brew-ec-with-optional:latest # Install low-latency packages -RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_Y0_RELEASE_VERSION"}} && \ +RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_EC_RELEASE_VERSION"}} && \ # {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} dnf install -y kernel-rt && \ # {{- end }} diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile index 632467b75a..6a15853e86 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile @@ -3,7 +3,7 @@ FROM localhost/rhel96-bootc-brew-rc-with-optional:latest # Install low-latency packages -RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_Y0_RELEASE_VERSION"}} && \ +RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_RC_RELEASE_VERSION"}} && \ # {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} dnf install -y kernel-rt && \ # {{- end }} From cea60d72a998e7bfdf4d2195525b0043eeb04f72 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 10 Dec 2025 11:43:06 +0100 Subject: [PATCH 8/9] add microshift-rt repo into the containerfiles --- ...-bootc-brew-ec-with-optional-tuned.containerfile | 6 ++++++ ...-bootc-brew-rc-with-optional-tuned.containerfile | 6 ++++++ ...c-brew-zstream-with-optional-tuned.containerfile | 6 ++++++ test/package-sources-bootc/microshift-rt.repo | 13 +++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 test/package-sources-bootc/microshift-rt.repo diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile index a433fcd50e..b4f518372f 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile @@ -2,10 +2,16 @@ # Note: This comment makes templating add a new line before the code FROM localhost/rhel96-bootc-brew-ec-with-optional:latest +# Copy repository configuration for rt kernel +# {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +COPY ./bootc-images/microshift-rt.repo /etc/yum.repos.d/ +# {{- end }} + # Install low-latency packages RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_EC_RELEASE_VERSION"}} && \ # {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} dnf install -y kernel-rt && \ +rm -vf /etc/yum.repos.d/microshift-rt.repo && \ # {{- end }} dnf clean all diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile index 6a15853e86..edddd035f2 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile @@ -2,10 +2,16 @@ # Note: This comment makes templating add a new line before the code FROM localhost/rhel96-bootc-brew-rc-with-optional:latest +# Copy repository configuration for rt kernel +# {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +COPY ./bootc-images/microshift-rt.repo /etc/yum.repos.d/ +# {{- end }} + # Install low-latency packages RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_RC_RELEASE_VERSION"}} && \ # {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} dnf install -y kernel-rt && \ +rm -vf /etc/yum.repos.d/microshift-rt.repo && \ # {{- end }} dnf clean all diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile index 274be37b25..027efb695a 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile @@ -2,10 +2,16 @@ # Note: This comment makes templating add a new line before the code FROM localhost/rhel96-bootc-brew-zstream-with-optional:latest +# Copy repository configuration for rt kernel +# {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +COPY ./bootc-images/microshift-rt.repo /etc/yum.repos.d/ +# {{- end }} + # Install low-latency packages RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_Y0_RELEASE_VERSION"}} && \ # {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} dnf install -y kernel-rt && \ +rm -vf /etc/yum.repos.d/microshift-rt.repo && \ # {{- end }} dnf clean all diff --git a/test/package-sources-bootc/microshift-rt.repo b/test/package-sources-bootc/microshift-rt.repo new file mode 100644 index 0000000000..6cefd590e6 --- /dev/null +++ b/test/package-sources-bootc/microshift-rt.repo @@ -0,0 +1,13 @@ +{{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} +[rhel-9-for-x86_64-rt-rpms] +name = Red Hat Enterprise Linux 9 for x86_64 - Real Time (RPMs) +baseurl = https://cdn.redhat.com/content/dist/rhel9/9.6/{{ .Env.UNAME_M }}/rt/os +enabled = 1 +gpgcheck = 1 +gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release +sslverify = 1 +sslcacert = /etc/rhsm/ca/redhat-uep.pem +sslclientkey = {{ .Env.SSL_CLIENT_KEY_FILE }} +sslclientcert = {{ .Env.SSL_CLIENT_CERT_FILE }} +skip_if_unavailable = 0 +{{- end -}} From ec5ddbe6795feae06f838da8084c4d851ffa6501 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Wed, 10 Dec 2025 20:50:59 +0100 Subject: [PATCH 9/9] add remove kernel in containerfile --- .../rhel96-bootc-brew-ec-with-optional-tuned.containerfile | 1 + .../rhel96-bootc-brew-rc-with-optional-tuned.containerfile | 1 + .../rhel96-bootc-brew-zstream-with-optional-tuned.containerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile index b4f518372f..4131ba7479 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-ec-with-optional-tuned.containerfile @@ -11,6 +11,7 @@ COPY ./bootc-images/microshift-rt.repo /etc/yum.repos.d/ RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_EC_RELEASE_VERSION"}} && \ # {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} dnf install -y kernel-rt && \ +dnf remove -y kernel kernel-core kernel-modules && \ rm -vf /etc/yum.repos.d/microshift-rt.repo && \ # {{- end }} dnf clean all diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile index edddd035f2..ad4576452b 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-rc-with-optional-tuned.containerfile @@ -11,6 +11,7 @@ COPY ./bootc-images/microshift-rt.repo /etc/yum.repos.d/ RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_RC_RELEASE_VERSION"}} && \ # {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} dnf install -y kernel-rt && \ +dnf remove -y kernel kernel-core kernel-modules && \ rm -vf /etc/yum.repos.d/microshift-rt.repo && \ # {{- end }} dnf clean all diff --git a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile index 027efb695a..a58d94eba8 100644 --- a/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile +++ b/test/image-blueprints-bootc/layer1-base/group4/rhel96-bootc-brew-zstream-with-optional-tuned.containerfile @@ -11,6 +11,7 @@ COPY ./bootc-images/microshift-rt.repo /etc/yum.repos.d/ RUN dnf install -y microshift-low-latency-{{env.Getenv "BREW_Y0_RELEASE_VERSION"}} && \ # {{- if and (env.Getenv "UNAME_M" "") (eq "x86_64" .Env.UNAME_M) }} dnf install -y kernel-rt && \ +dnf remove -y kernel kernel-core kernel-modules && \ rm -vf /etc/yum.repos.d/microshift-rt.repo && \ # {{- end }} dnf clean all